diff options
| author | tmk <nobody@nowhere> | 2013-11-08 04:33:13 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-11-08 04:37:09 +0900 |
| commit | c531a185a48a2084c20cc17c40e8274bc27fd734 (patch) | |
| tree | 9170aba61e0c04d2215ee73edddfa7c831009c17 | |
| parent | 84b9ce7125d6a2a376419694ac461214333b12bc (diff) | |
| download | qmk_firmware-c531a185a48a2084c20cc17c40e8274bc27fd734.tar.gz qmk_firmware-c531a185a48a2084c20cc17c40e8274bc27fd734.zip | |
Disable BOOTMAGIC and fix debug prints of adb_usb
| -rw-r--r-- | converter/adb_usb/Makefile | 4 | ||||
| -rw-r--r-- | converter/adb_usb/matrix.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/converter/adb_usb/Makefile b/converter/adb_usb/Makefile index 372ef6c09..211416742 100644 --- a/converter/adb_usb/Makefile +++ b/converter/adb_usb/Makefile | |||
| @@ -94,7 +94,7 @@ ARCH = AVR8 | |||
| 94 | F_USB = $(F_CPU) | 94 | F_USB = $(F_CPU) |
| 95 | 95 | ||
| 96 | # Interrupt driven control endpoint task(+60) | 96 | # Interrupt driven control endpoint task(+60) |
| 97 | #OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT | 97 | OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT |
| 98 | 98 | ||
| 99 | 99 | ||
| 100 | # Boot Section Size in *bytes* | 100 | # Boot Section Size in *bytes* |
| @@ -109,7 +109,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096 | |||
| 109 | # Build Options | 109 | # Build Options |
| 110 | # comment out to disable the options. | 110 | # comment out to disable the options. |
| 111 | # | 111 | # |
| 112 | BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) | 112 | #BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) |
| 113 | MOUSEKEY_ENABLE = yes # Mouse keys(+4700) | 113 | MOUSEKEY_ENABLE = yes # Mouse keys(+4700) |
| 114 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) | 114 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) |
| 115 | CONSOLE_ENABLE = yes # Console for debug(+400) | 115 | CONSOLE_ENABLE = yes # Console for debug(+400) |
diff --git a/converter/adb_usb/matrix.c b/converter/adb_usb/matrix.c index 54be2b0f5..d1b67d38d 100644 --- a/converter/adb_usb/matrix.c +++ b/converter/adb_usb/matrix.c | |||
| @@ -79,9 +79,9 @@ void matrix_init(void) | |||
| 79 | for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00; | 79 | for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00; |
| 80 | 80 | ||
| 81 | debug_enable = true; | 81 | debug_enable = true; |
| 82 | debug_matrix = true; | 82 | //debug_matrix = true; |
| 83 | debug_keyboard = true; | 83 | //debug_keyboard = true; |
| 84 | debug_mouse = true; | 84 | //debug_mouse = true; |
| 85 | print("debug enabled.\n"); | 85 | print("debug enabled.\n"); |
| 86 | return; | 86 | return; |
| 87 | } | 87 | } |
| @@ -108,7 +108,7 @@ uint8_t matrix_scan(void) | |||
| 108 | } else if (codes == 0xFFFF) { // power key release | 108 | } else if (codes == 0xFFFF) { // power key release |
| 109 | register_key(0xFF); | 109 | register_key(0xFF); |
| 110 | } else if (key0 == 0xFF) { // error | 110 | } else if (key0 == 0xFF) { // error |
| 111 | xprintf("adb_host_kbd_recv: ERROR(%02X)\n", codes); | 111 | xprintf("adb_host_kbd_recv: ERROR(%d)\n", codes); |
| 112 | return key1; | 112 | return key1; |
| 113 | } else { | 113 | } else { |
| 114 | register_key(key0); | 114 | register_key(key0); |
