X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=converter%2Fnext_usb%2Fmatrix.c;h=18395a7eb115f3e996e01b33f77ca4642c629393;hb=1575db9166a21591bed95d4653db4d5d45e534be;hp=fd6eb9d64fe5f19838ad26784f0869b8ca7c34c8;hpb=d9fee5571d7de08e76dff5ce75816faf522240f6;p=max%2Ftmk_keyboard.git

diff --git a/converter/next_usb/matrix.c b/converter/next_usb/matrix.c
index fd6eb9d6..18395a7e 100644
--- a/converter/next_usb/matrix.c
+++ b/converter/next_usb/matrix.c
@@ -66,20 +66,6 @@ static uint8_t matrix[MATRIX_ROWS];
 
 static bool is_modified = false;
 
-/* number of matrix rows */
-inline
-uint8_t matrix_rows(void)
-{
-    return MATRIX_ROWS;
-}
-
-/* number of matrix columns */
-inline
-uint8_t matrix_cols(void)
-{
-    return MATRIX_COLS;
-}
-
 #ifndef NEXT_KBD_LED1_ON
 #define NEXT_KBD_LED1_ON
 #endif
@@ -160,7 +146,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 +173,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, \
@@ -225,19 +213,6 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
-/* whether modified from previous scan. used after matrix_scan. */
-bool matrix_is_modified()
-{
-    return is_modified;
-}
-
-/* whether a switch is on */
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
-    return (matrix[row] & (1<<col));
-}
-
 /* matrix state on row */
 inline
 uint8_t matrix_get_row(uint8_t row)
@@ -245,11 +220,6 @@ uint8_t matrix_get_row(uint8_t row)
     return matrix[row];
 }
 
-/* print matrix for debug */
-void matrix_print(void)
-{
-}
-
 inline
 static void matrix_make(uint8_t code)
 {