summaryrefslogtreecommitdiff
path: root/keyboards/redox_w
diff options
context:
space:
mode:
authorTomasz Janeczko <janecztom@gmail.com>2022-06-07 19:22:13 +0100
committerGitHub <noreply@github.com>2022-06-07 11:22:13 -0700
commitc681b6dbf300270e3e93ab72a57d4a7c18d794e1 (patch)
tree8126c9b9c0ef35f2e4fd0d3553ff49d3a0ffa151 /keyboards/redox_w
parent5d767f8361a39a7902b81d3902360ca1d22242f4 (diff)
[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 <tomasz.j@hey.com>
Diffstat (limited to 'keyboards/redox_w')
-rw-r--r--keyboards/redox_w/matrix.c11
1 files changed, 9 insertions, 2 deletions
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