diff options
Diffstat (limited to 'keyboards/converter')
| -rw-r--r-- | keyboards/converter/hp_46010a/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/converter/ibm_terminal/matrix.c | 26 | ||||
| -rw-r--r-- | keyboards/converter/m0110_usb/m0110.c | 3 | ||||
| -rw-r--r-- | keyboards/converter/palm_usb/matrix.c | 5 | ||||
| -rw-r--r-- | keyboards/converter/sun_usb/matrix.c | 2 |
5 files changed, 17 insertions, 20 deletions
diff --git a/keyboards/converter/hp_46010a/rules.mk b/keyboards/converter/hp_46010a/rules.mk index d4e702622a..104381f12f 100644 --- a/keyboards/converter/hp_46010a/rules.mk +++ b/keyboards/converter/hp_46010a/rules.mk @@ -12,7 +12,6 @@ AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. SPLIT_KEYBOARD = no WAIT_FOR_USB = yes -LAYOUTS_HAS_RGB = no CUSTOM_MATRIX = yes SRC = matrix.c diff --git a/keyboards/converter/ibm_terminal/matrix.c b/keyboards/converter/ibm_terminal/matrix.c index de346a0f70..d245ff61b2 100644 --- a/keyboards/converter/ibm_terminal/matrix.c +++ b/keyboards/converter/ibm_terminal/matrix.c @@ -87,23 +87,23 @@ uint8_t matrix_scan(void) uint8_t code; if ((code = ps2_host_recv())) { - debug("r"); debug_hex(code); debug(" "); + dprintf("r%02X ", code); } switch (state) { case RESET: - debug("wFF "); + dprint("wFF "); if (ps2_host_send(0xFF) == 0xFA) { - debug("[ack]\nRESET_RESPONSE: "); + dprint("[ack]\nRESET_RESPONSE: "); state = RESET_RESPONSE; } break; case RESET_RESPONSE: if (code == 0xAA) { - debug("[ok]\nKBD_ID: "); + dprint("[ok]\nKBD_ID: "); state = KBD_ID0; } else if (code) { - debug("err\nRESET: "); + dprint("err\nRESET: "); state = RESET; } break; @@ -115,14 +115,14 @@ uint8_t matrix_scan(void) break; case KBD_ID1: if (code) { - debug("\nCONFIG: "); + dprint("\nCONFIG: "); state = CONFIG; } break; case CONFIG: - debug("wF8 "); + dprint("wF8 "); if (ps2_host_send(0xF8) == 0xFA) { - debug("[ack]\nREADY\n"); + dprint("[ack]\nREADY\n"); state = READY; } break; @@ -132,16 +132,16 @@ uint8_t matrix_scan(void) break; case 0xF0: state = F0_BREAK; - debug(" "); + dprint(" "); break; default: // normal key make if (code < 0x88) { matrix_make(code); } else { - debug("unexpected scan code at READY: "); debug_hex(code); debug("\n"); + dprintf("unexpected scan code at READY: %02X\n", code); } state = READY; - debug("\n"); + dprint("\n"); } break; case F0_BREAK: // Break code @@ -152,10 +152,10 @@ uint8_t matrix_scan(void) if (code < 0x88) { matrix_break(code); } else { - debug("unexpected scan code at F0: "); debug_hex(code); debug("\n"); + dprintf("unexpected scan code at F0: %02X\n", code); } state = READY; - debug("\n"); + dprint("\n"); } break; } diff --git a/keyboards/converter/m0110_usb/m0110.c b/keyboards/converter/m0110_usb/m0110.c index f3097fb465..308eb936e3 100644 --- a/keyboards/converter/m0110_usb/m0110.c +++ b/keyboards/converter/m0110_usb/m0110.c @@ -312,8 +312,7 @@ static inline uint8_t instant(void) { m0110_send(M0110_INSTANT); uint8_t data = m0110_recv(); if (data != M0110_NULL) { - debug_hex(data); - debug(" "); + dprintf("%02X ", data); } return data; } diff --git a/keyboards/converter/palm_usb/matrix.c b/keyboards/converter/palm_usb/matrix.c index 016b562254..8ae89deb6a 100644 --- a/keyboards/converter/palm_usb/matrix.c +++ b/keyboards/converter/palm_usb/matrix.c @@ -168,7 +168,7 @@ uint8_t get_serial_byte(void) { while(1) { code = uart_read(); if (code) { - debug_hex(code); debug(" "); + dprintf("%02X ", code); return code; } } @@ -316,8 +316,7 @@ uint8_t matrix_scan(void) last_activity = timer_read(); disconnect_counter=0; // if we are getting serial data, we're connected. - debug_hex(code); debug(" "); - + dprintf("%02X ", code); switch (code) { case 0xFD: // unexpected reset byte 2 diff --git a/keyboards/converter/sun_usb/matrix.c b/keyboards/converter/sun_usb/matrix.c index bf1d5f807f..6d52d5cd6c 100644 --- a/keyboards/converter/sun_usb/matrix.c +++ b/keyboards/converter/sun_usb/matrix.c @@ -111,7 +111,7 @@ uint8_t matrix_scan(void) code = uart_read(); if (!code) return 0; - debug_hex(code); debug(" "); + dprintf("%02X ", code); switch (code) { case 0xFF: // reset success: FF 04 |