Move more UART-based keyboards to use timeout correctly. (#17329)

Co-authored-by: Tomasz Janeczko <tomasz.j@hey.com>

1 files changed, 10 insertions, 6 deletions

diff --git a/keyboards/dichotomy/matrix.c b/keyboards/dichotomy/matrix.c
index dc90e7501e..0799554f0a 100755
--- a/keyboards/dichotomy/matrix.c
+++ b/keyboards/dichotomy/matrix.c
@@ -48,6 +48,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MAIN_ROWMASK 0xFFF0;
 #define LOWER_ROWMASK 0x3FC0;
 
+#define UART_MATRIX_RESPONSE_TIMEOUT 10000
+
 /* matrix state(1:on, 0:off) */
 static matrix_row_t matrix[MATRIX_ROWS];
 
@@ -96,8 +98,6 @@ void matrix_init(void) {
 
 uint8_t matrix_scan(void)
 {
-    //xprintf("\r\nTRYING TO SCAN");
-
     uint32_t timeout = 0;
 
     //the s character requests the RF slave to send the matrix
@@ -113,18 +113,22 @@ uint8_t matrix_scan(void)
         //harm to leave it in here
         while(!uart_available()){
             timeout++;
-            if (timeout > 10000){
-		xprintf("\r\nTime out in keyboard.");
+            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
     //will only show up here if the correct bytes were recieved
             uint8_t checksum = 0x00;
-            for (uint8_t z=0; z<10; z++){
+            for (uint8_t z = 0; z < 10; z++){
                 checksum = checksum^uart_data[z];
             }
             checksum = checksum ^ (uart_data[10] & 0xF0);