diff options
| author | QMK Bot <hello@qmk.fm> | 2022-05-10 01:29:03 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-05-10 01:29:03 +0000 |
| commit | bfa04efada377b7cac2cfcb92e8cf50ef4202b0a (patch) | |
| tree | c92c596c47fa11ef10eaeb79d7f9782cd77c3914 | |
| parent | f1c69e5d2c81961d2705bcf46601c517d1fd2c51 (diff) | |
| parent | 120d5d5520eff41a06f6544df42547ec4602d007 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/nullbitsco/common/remote_kb.c | 10 | ||||
| -rw-r--r-- | keyboards/nullbitsco/common/remote_kb.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/keyboards/nullbitsco/common/remote_kb.c b/keyboards/nullbitsco/common/remote_kb.c index 4dcc9f4616..8e3f7f6766 100644 --- a/keyboards/nullbitsco/common/remote_kb.c +++ b/keyboards/nullbitsco/common/remote_kb.c @@ -62,13 +62,12 @@ static void send_msg(uint16_t keycode, bool pressed) { msg[IDX_KCMSB] = (keycode >> 8) & 0xFF; msg[IDX_PRESSED] = pressed; msg[IDX_CHECKSUM] = chksum8(msg, UART_MSG_LEN-1); - uart_transmit(msg, UART_MSG_LEN); } -static void print_message_buffer(void) { +static inline void print_message_buffer(void) { for (int i=0; i<UART_MSG_LEN; i++) { - dprintf("msg[%u]: %u\n", i, msg[i]); + dprintf("msg[%u]: 0x%02X\n", i, msg[i]); } } @@ -77,7 +76,7 @@ static void process_uart(void) { if (msg[IDX_PREAMBLE] != UART_PREAMBLE || msg[IDX_CHECKSUM] != chksum) { dprintf("UART checksum mismatch!\n"); print_message_buffer(); - dprintf("calc checksum: %u\n", chksum); + dprintf("calc checksum: 0x%02X\n", chksum); } else { uint16_t keycode = (uint16_t)msg[IDX_KCLSB] | ((uint16_t)msg[IDX_KCMSB] << 8); bool pressed = (bool)msg[IDX_PRESSED]; @@ -102,13 +101,14 @@ static void process_uart(void) { static void get_msg(void) { while (uart_available()) { msg[msg_idx] = uart_read(); - dprintf("idx: %u, recv: %u\n", msg_idx, msg[msg_idx]); + dprintf("idx: %u, recv: 0x%002X\n", msg_idx, msg[msg_idx]); if (msg_idx == 0 && (msg[msg_idx] != UART_PREAMBLE)) { dprintf("Byte sync error!\n"); msg_idx = 0; } else if (msg_idx == (UART_MSG_LEN-1)) { process_uart(); msg_idx = 0; + break; } else { msg_idx++; } diff --git a/keyboards/nullbitsco/common/remote_kb.h b/keyboards/nullbitsco/common/remote_kb.h index 6270e8f9f1..da124bf5f4 100644 --- a/keyboards/nullbitsco/common/remote_kb.h +++ b/keyboards/nullbitsco/common/remote_kb.h @@ -17,7 +17,7 @@ #include "quantum.h" -#define SERIAL_UART_BAUD 153600 //low error rate for 32u4 @ 16MHz +#define SERIAL_UART_BAUD 76800 //low error rate for 32u4 @ 16MHz #define UART_PREAMBLE 0x69 #define UART_MSG_LEN 5 |