|
@@ -48,6 +48,8 @@ along with this program. If not, see <http:
|
|
|
#define MAIN_ROWMASK 0xFFF0;
|
|
|
#define LOWER_ROWMASK 0x3FC0;
|
|
|
|
|
|
+#define UART_MATRIX_RESPONSE_TIMEOUT 10000
|
|
|
+
|
|
|
|
|
|
static matrix_row_t matrix[MATRIX_ROWS];
|
|
|
|
|
@@ -96,8 +98,6 @@ void matrix_init(void) {
|
|
|
|
|
|
uint8_t matrix_scan(void)
|
|
|
{
|
|
|
-
|
|
|
-
|
|
|
uint32_t timeout = 0;
|
|
|
|
|
|
|
|
@@ -113,18 +113,22 @@ uint8_t matrix_scan(void)
|
|
|
|
|
|
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;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
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);
|