From a632593769758244f10f577adb69b30e06f64985 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 26 Jan 2024 16:32:06 +0000 Subject: [PATCH] Migrate and remove deprecated debug utils (#22961) --- keyboards/40percentclub/ut47/matrix.c | 2 +- keyboards/amjkeyboard/amj96/matrix.c | 2 +- keyboards/bioi/bluetooth_custom.c | 10 +-- keyboards/converter/ibm_terminal/matrix.c | 26 +++---- keyboards/converter/m0110_usb/m0110.c | 3 +- keyboards/converter/palm_usb/matrix.c | 5 +- keyboards/converter/sun_usb/matrix.c | 2 +- keyboards/handwired/frenchdev/matrix.c | 2 +- keyboards/ibm/model_m/mschwingen/matrix.c | 3 +- keyboards/kinesis/alvicstep/matrix.c | 2 +- keyboards/sirius/unigo66/main.c | 2 +- quantum/led.c | 4 +- quantum/logging/debug.h | 90 ----------------------- 13 files changed, 26 insertions(+), 127 deletions(-) diff --git a/keyboards/40percentclub/ut47/matrix.c b/keyboards/40percentclub/ut47/matrix.c index 97922e2dbe9..02ed88b7091 100644 --- a/keyboards/40percentclub/ut47/matrix.c +++ b/keyboards/40percentclub/ut47/matrix.c @@ -76,7 +76,7 @@ uint8_t matrix_scan(void) if (matrix_debouncing[i] != cols) { matrix_debouncing[i] = cols; if (debouncing) { - debug("bounce!: "); debug_hex(debouncing); debug("\n"); + dprintf("bounce!: %02X\n", debouncing); } debouncing = DEBOUNCE; } diff --git a/keyboards/amjkeyboard/amj96/matrix.c b/keyboards/amjkeyboard/amj96/matrix.c index 2999c6241ba..7faf40d4fe7 100644 --- a/keyboards/amjkeyboard/amj96/matrix.c +++ b/keyboards/amjkeyboard/amj96/matrix.c @@ -88,7 +88,7 @@ uint8_t matrix_scan(void) if (matrix_debouncing[i] != cols) { matrix_debouncing[i] = cols; if (debouncing) { - debug("bounce!: "); debug_hex(debouncing); debug("\n"); + dprintf("bounce!: %02X\n", debouncing); } debouncing = DEBOUNCE; } diff --git a/keyboards/bioi/bluetooth_custom.c b/keyboards/bioi/bluetooth_custom.c index 4ea277f731a..c3e12d3c6a1 100644 --- a/keyboards/bioi/bluetooth_custom.c +++ b/keyboards/bioi/bluetooth_custom.c @@ -59,9 +59,7 @@ static void bluefruit_trace_footer(void) static void bluefruit_serial_send(uint8_t data) { #ifdef BLUEFRUIT_TRACE_SERIAL - dprintf(" "); - debug_hex8(data); - dprintf(" "); + dprintf(" %02X ", data); #endif serial_send(data); } @@ -146,11 +144,7 @@ void bluetooth_send_consumer(uint16_t usage) uint16_t bitmap = CONSUMER2BLUEFRUIT(usage); #ifdef BLUEFRUIT_TRACE_SERIAL - dprintf("\nData: "); - debug_hex16(data); - dprintf("; bitmap: "); - debug_hex16(bitmap); - dprintf("\n"); + dprintf("\nData: %04X; bitmap: %04X\n", data, bitmap); bluefruit_trace_header(); #endif send_str(PSTR("AT+BLEHIDCONTROLKEY=0x")); diff --git a/keyboards/converter/ibm_terminal/matrix.c b/keyboards/converter/ibm_terminal/matrix.c index de346a0f70b..d245ff61b28 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 f3097fb4651..308eb936e3e 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 016b5622541..8ae89deb6ae 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 bf1d5f807fd..6d52d5cd6c5 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 diff --git a/keyboards/handwired/frenchdev/matrix.c b/keyboards/handwired/frenchdev/matrix.c index 3afc6dcee6d..af7c8b54442 100644 --- a/keyboards/handwired/frenchdev/matrix.c +++ b/keyboards/handwired/frenchdev/matrix.c @@ -151,7 +151,7 @@ uint8_t matrix_scan(void) if (matrix_debouncing[i] != cols) { matrix_debouncing[i] = cols; if (debouncing) { - debug("bounce!: "); debug_hex(debouncing); debug("\n"); + dprintf("bounce!: %02X\n", debouncing); } debouncing = DEBOUNCE; } diff --git a/keyboards/ibm/model_m/mschwingen/matrix.c b/keyboards/ibm/model_m/mschwingen/matrix.c index 9997b659756..361803edec4 100644 --- a/keyboards/ibm/model_m/mschwingen/matrix.c +++ b/keyboards/ibm/model_m/mschwingen/matrix.c @@ -60,8 +60,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) row_data = spi_read() << 8; row_data |= spi_read(); - debug_hex8(~row_data); - dprint(" "); + dprintf("%02X ", ~row_data); // For each row... for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) { diff --git a/keyboards/kinesis/alvicstep/matrix.c b/keyboards/kinesis/alvicstep/matrix.c index 07df19e966b..e1e637725b2 100644 --- a/keyboards/kinesis/alvicstep/matrix.c +++ b/keyboards/kinesis/alvicstep/matrix.c @@ -116,7 +116,7 @@ uint8_t matrix_scan(void) if (matrix_debouncing[i] != row) { matrix_debouncing[i] = row; if (debouncing) { - debug("bounce!: "); debug_hex(debouncing); debug("\n"); + dprintf("bounce!: %02X\n", debouncing); } debouncing = DEBOUNCE; } diff --git a/keyboards/sirius/unigo66/main.c b/keyboards/sirius/unigo66/main.c index b4f2a91e49d..4f8e2f0c94f 100644 --- a/keyboards/sirius/unigo66/main.c +++ b/keyboards/sirius/unigo66/main.c @@ -85,7 +85,7 @@ int main(void) _delay_ms(1000); } - debug("init: done\n"); + dprintln("init: done"); for (;;) { keyboard_task(); diff --git a/quantum/led.c b/quantum/led.c index 8d86374a6f2..1e7ee9db76c 100644 --- a/quantum/led.c +++ b/quantum/led.c @@ -183,9 +183,7 @@ void led_task(void) { last_led_modification_time = timer_read32(); if (debug_keyboard) { - debug("led_task: "); - debug_hex8(led_status); - debug("\n"); + dprintf("led_task: %02X\n", led_status); } led_set(led_status); } diff --git a/quantum/logging/debug.h b/quantum/logging/debug.h index 84153103569..25d57b156b1 100644 --- a/quantum/logging/debug.h +++ b/quantum/logging/debug.h @@ -69,101 +69,11 @@ extern debug_config_t debug_config; } while (0) # define dmsg(s) dprintf("%s at %d: %s\n", __FILE__, __LINE__, s) -/* Deprecated. DO NOT USE these anymore, use dprintf instead. */ -# define debug(s) \ - do { \ - if (debug_enable) print(s); \ - } while (0) -# define debugln(s) \ - do { \ - if (debug_enable) println(s); \ - } while (0) -# define debug_msg(s) \ - do { \ - if (debug_enable) { \ - print(__FILE__); \ - print(" at "); \ - print_dec(__LINE__); \ - print(" in "); \ - print(": "); \ - print(s); \ - } \ - } while (0) -# define debug_dec(data) \ - do { \ - if (debug_enable) print_dec(data); \ - } while (0) -# define debug_decs(data) \ - do { \ - if (debug_enable) print_decs(data); \ - } while (0) -# define debug_hex4(data) \ - do { \ - if (debug_enable) print_hex4(data); \ - } while (0) -# define debug_hex8(data) \ - do { \ - if (debug_enable) print_hex8(data); \ - } while (0) -# define debug_hex16(data) \ - do { \ - if (debug_enable) print_hex16(data); \ - } while (0) -# define debug_hex32(data) \ - do { \ - if (debug_enable) print_hex32(data); \ - } while (0) -# define debug_bin8(data) \ - do { \ - if (debug_enable) print_bin8(data); \ - } while (0) -# define debug_bin16(data) \ - do { \ - if (debug_enable) print_bin16(data); \ - } while (0) -# define debug_bin32(data) \ - do { \ - if (debug_enable) print_bin32(data); \ - } while (0) -# define debug_bin_reverse8(data) \ - do { \ - if (debug_enable) print_bin_reverse8(data); \ - } while (0) -# define debug_bin_reverse16(data) \ - do { \ - if (debug_enable) print_bin_reverse16(data); \ - } while (0) -# define debug_bin_reverse32(data) \ - do { \ - if (debug_enable) print_bin_reverse32(data); \ - } while (0) -# define debug_hex(data) debug_hex8(data) -# define debug_bin(data) debug_bin8(data) -# define debug_bin_reverse(data) debug_bin8(data) - #else /* NO_DEBUG */ # define dprint(s) # define dprintln(s) # define dprintf(fmt, ...) # define dmsg(s) -# define debug(s) -# define debugln(s) -# define debug_msg(s) -# define debug_dec(data) -# define debug_decs(data) -# define debug_hex4(data) -# define debug_hex8(data) -# define debug_hex16(data) -# define debug_hex32(data) -# define debug_bin8(data) -# define debug_bin16(data) -# define debug_bin32(data) -# define debug_bin_reverse8(data) -# define debug_bin_reverse16(data) -# define debug_bin_reverse32(data) -# define debug_hex(data) -# define debug_bin(data) -# define debug_bin_reverse(data) #endif /* NO_DEBUG */