X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=converter%2Fm0110_usb%2Fmatrix.c;h=b216aba1bba45c4586d6d3a53591ab8880f98de7;hb=a93677cbf145baf210f92a9129ded55c9ef5657b;hp=1ca6894c440b4fd71e1d994c1bd13bec76db476e;hpb=afb08462085132acf7a1962522952f7dbf064519;p=max%2Ftmk_keyboard.git

diff --git a/converter/m0110_usb/matrix.c b/converter/m0110_usb/matrix.c
index 1ca6894c..b216aba1 100644
--- a/converter/m0110_usb/matrix.c
+++ b/converter/m0110_usb/matrix.c
@@ -46,31 +46,18 @@ static uint8_t _matrix0[MATRIX_ROWS];
 static void register_key(uint8_t key);
 
 
-inline
-uint8_t matrix_rows(void)
-{
-    return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void)
-{
-    return MATRIX_COLS;
-}
-
 void matrix_init(void)
 {
-    print_enable = true;
-    debug_enable = true;
-    debug_matrix = false;
-    debug_keyboard = false;
-    debug_mouse = false;
-    print("debug enabled.\n");
-
     m0110_init();
     // initialize matrix state: all keys off
     for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0x00;
     matrix = _matrix0;
+
+    // LED flash
+    DDRD |= (1<<6); PORTD |= (1<<6);
+    _delay_ms(500);
+    DDRD |= (1<<6); PORTD &= ~(1<<6);
+
     return;
 }
 
@@ -81,31 +68,11 @@ uint8_t matrix_scan(void)
     is_modified = false;
     key = m0110_recv_key();
 
-#ifdef MATRIX_HAS_LOCKING_CAPS
-    // Send Caps key up event
-    if (matrix_is_on(ROW(CAPS), COL(CAPS))) {
-        is_modified = true;
-        register_key(CAPS_BREAK);
-    }
-#endif
     if (key == M0110_NULL) {
         return 0;
     } else if (key == M0110_ERROR) {
         return 0;
     } else {
-#ifdef MATRIX_HAS_LOCKING_CAPS    
-        if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
-            // CAPS LOCK on:
-            // Ignore LockingCaps key down event
-            if (key == CAPS) return 0;
-            // Convert LockingCaps key up event into down event
-            if (key == CAPS_BREAK) key = CAPS;
-        } else {
-            // CAPS LOCK off:
-            // Ignore LockingCaps key up event
-            if (key == CAPS_BREAK) return 0;
-        }
-#endif        
         is_modified = true;
         register_key(key);
     }
@@ -116,48 +83,12 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
-bool matrix_is_modified(void)
-{
-    return is_modified;
-}
-
-inline
-bool matrix_has_ghost(void)
-{
-    return false;
-}
-
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
-    return (matrix[row] & (1<<col));
-}
-
 inline
 uint8_t matrix_get_row(uint8_t row)
 {
     return matrix[row];
 }
 
-void matrix_print(void)
-{
-    print("\nr/c 01234567\n");
-    for (uint8_t row = 0; row < matrix_rows(); row++) {
-        phex(row); print(": ");
-        pbin_reverse(matrix_get_row(row));
-        print("\n");
-    }
-}
-
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop(matrix[i]);
-    }
-    return count;
-}
-
 inline
 static void register_key(uint8_t key)
 {