Disable BOOTMAGIC and fix debug prints of adb_usb

diff --git a/converter/adb_usb/Makefile b/converter/adb_usb/Makefile
index 372ef6c09a2c5eb77aebf86a1e3653231126df73..21141674245d4f2356a7185f1f18cd90811c0ed3 100644 (file)
--- a/converter/adb_usb/Makefile
+++ b/converter/adb_usb/Makefile
@@ -94,7 +94,7 @@ ARCH = AVR8
 F_USB = $(F_CPU)
 
 # Interrupt driven control endpoint task(+60)
-#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 
 
 # Boot Section Size in *bytes*
@@ -109,7 +109,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
+#BOOTMAGIC_ENABLE = yes        # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes  # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes  # Audio control and System control(+450)
 CONSOLE_ENABLE = yes   # Console for debug(+400)

diff --git a/converter/adb_usb/matrix.c b/converter/adb_usb/matrix.c
index 54be2b0f579fcabb4adee319022218f21524d2b6..d1b67d38d66f57cc913d2aae62ef89335a83903f 100644 (file)
--- a/converter/adb_usb/matrix.c
+++ b/converter/adb_usb/matrix.c
@@ -79,9 +79,9 @@ void matrix_init(void)
     for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
 
     debug_enable = true;
-    debug_matrix = true;
-    debug_keyboard = true;
-    debug_mouse = true;
+    //debug_matrix = true;
+    //debug_keyboard = true;
+    //debug_mouse = true;
     print("debug enabled.\n");
     return;
 }
@@ -108,7 +108,7 @@ uint8_t matrix_scan(void)
     } else if (codes == 0xFFFF) {   // power key release
         register_key(0xFF);
     } else if (key0 == 0xFF) {      // error
-        xprintf("adb_host_kbd_recv: ERROR(%02X)\n", codes);
+        xprintf("adb_host_kbd_recv: ERROR(%d)\n", codes);
         return key1;
     } else {
         register_key(key0);