Merge remote-tracking branch 'tmk/master'

[max/tmk_keyboard.git] / converter / next_usb / matrix.c

diff --git a/converter/next_usb/matrix.c b/converter/next_usb/matrix.c
index 506378d9046aeebb87f2295535875ac1b10cc0c3..524d57847603cdecc60873ede7425553696bf83b 100644 (file)
--- a/converter/next_usb/matrix.c
+++ b/converter/next_usb/matrix.c
@@ -160,7 +160,7 @@ void matrix_init(void)
 /* scan all key states on matrix */
 uint8_t matrix_scan(void)
 {
-    _delay_ms(20);
+    _delay_ms(5);
     
     //next_kbd_set_leds(false, false);
     NEXT_KBD_LED1_OFF;
@@ -187,7 +187,7 @@ uint8_t matrix_scan(void)
     
     uint32_t resp = (next_kbd_recv());
     
-    if (resp == NEXT_KBD_KMBUS_IDLE)
+    if (!resp || resp == NEXT_KBD_KMBUS_IDLE)
     {
         return 0;
     }