Migrate and remove deprecated debug utils (#22961)
This commit is contained in:
parent
728aa576b0
commit
a632593769
13 changed files with 26 additions and 127 deletions
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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"));
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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++) {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ int main(void)
|
|||
_delay_ms(1000);
|
||||
}
|
||||
|
||||
debug("init: done\n");
|
||||
dprintln("init: done");
|
||||
|
||||
for (;;) {
|
||||
keyboard_task();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue