From c681b6dbf300270e3e93ab72a57d4a7c18d794e1 Mon Sep 17 00:00:00 2001 From: Tomasz Janeczko Date: Tue, 7 Jun 2022 19:22:13 +0100 Subject: [Keyboard] Handle timeout on UART for Redox Wireless (#17203) * Handle timeout on UART for Redox Wireless receiver-to-keyboard communication. - This fixes the issue of a keyboard deadlocking on the first matrix scan with Redox Wireless keyboards * Remove an explicit cast. Co-authored-by: Tomasz Janeczko --- keyboards/redox_w/matrix.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'keyboards') diff --git a/keyboards/redox_w/matrix.c b/keyboards/redox_w/matrix.c index fd25231d9e..6a33e89976 100644 --- a/keyboards/redox_w/matrix.c +++ b/keyboards/redox_w/matrix.c @@ -18,6 +18,8 @@ #include "matrix.h" #include "uart.h" +#define UART_MATRIX_RESPONSE_TIMEOUT 10000 + void matrix_init_custom(void) { uart_init(1000000); } @@ -39,11 +41,16 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) { //harm to leave it in here while (!uart_available()) { timeout++; - if (timeout > 10000) { + if (timeout > UART_MATRIX_RESPONSE_TIMEOUT) { break; } } - uart_data[i] = uart_read(); + + if (timeout < UART_MATRIX_RESPONSE_TIMEOUT) { + uart_data[i] = uart_read(); + } else { + uart_data[i] = 0x00; + } } //check for the end packet, the key state bytes use the LSBs, so 0xE0 -- cgit v1.2.3