Merge pull request #1 from esell/bluefruit

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

diff --git a/converter/next_usb/matrix.c b/converter/next_usb/matrix.c
index fd6eb9d64fe5f19838ad26784f0869b8ca7c34c8..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,17 +187,19 @@ 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;
     }
     
     NEXT_KBD_LED1_ON;
     
+#ifdef NEXT_KBD_SHIFT_FLASH_LEDS
     next_kbd_set_leds(
         NEXT_KBD_PRESSED_SHIFT_LEFT(resp) ? true : false, 
         NEXT_KBD_PRESSED_SHIFT_RGHT(resp) ? true : false
     );
+#endif
     
     dprintf("[ r=%04lX keycode=%02X pressed=%X CTRL=%X SHIFT_LEFT=%X SHIFT_RGHT=%X CMD_LEFT=%X CMD_RGHT=%X ALT_LEFT=%X ALT_RGHT=%X ]\n", \
         resp, \