X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=converter%2Fadb_usb%2Fmatrix.c;h=405391865fe4861b296320726bd18f3f55c07579;hb=79cfa894afbc0a94ac642f57de905d9afc068ce7;hp=a2367af56a52c74a461d35121c48d3900a062735;hpb=62d1ebb91c7b381ce3d88aad9ee0b03bea9fce26;p=max%2Ftmk_keyboard.git

diff --git a/converter/adb_usb/matrix.c b/converter/adb_usb/matrix.c
index a2367af5..40539186 100644
--- a/converter/adb_usb/matrix.c
+++ b/converter/adb_usb/matrix.c
@@ -25,8 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "print.h"
 #include "util.h"
 #include "debug.h"
-#include "host.h"
-#include "led.h"
 #include "adb.h"
 #include "matrix.h"
 
@@ -38,27 +36,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #   error "MATRIX_ROWS must not exceed 255"
 #endif
 
-#define CAPS        0x39
-#define CAPS_UP     (CAPS | 0x80)
-#define ROW(key)    ((key)>>3&0x0F)
-#define COL(key)    ((key)&0x07)
 
-
-static bool _matrix_is_modified = false;
+static bool is_modified = false;
 
 // matrix state buffer(1:on, 0:off)
 #if (MATRIX_COLS <= 8)
-static uint8_t *matrix;
-static uint8_t _matrix0[MATRIX_ROWS];
+static uint8_t matrix[MATRIX_ROWS];
 #else
-static uint16_t *matrix;
-static uint16_t _matrix0[MATRIX_ROWS];
+static uint16_t matrix[MATRIX_ROWS];
 #endif
 
 #ifdef MATRIX_HAS_GHOST
 static bool matrix_has_ghost_in_row(uint8_t row);
 #endif
-static void _register_key(uint8_t key);
+static void register_key(uint8_t key);
 
 
 inline
@@ -76,74 +67,75 @@ uint8_t matrix_cols(void)
 void matrix_init(void)
 {
     adb_host_init();
+    // wait for keyboard to boot up and receive command
+    _delay_ms(1000);
+    // Enable keyboard left/right modifier distinction
+    // Addr:Keyboard(0010), Cmd:Listen(10), Register3(11)
+    // upper byte: reserved bits 0000, device address 0010
+    // lower byte: device handler 00000011
+    adb_host_listen(0x2B,0x02,0x03);
 
     // initialize matrix state: all keys off
-    for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0x00;
-    matrix = _matrix0;
+    for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
 
-    print_enable = true;
     debug_enable = true;
-    debug_matrix = true;
-    debug_keyboard = true;
-    debug_mouse = true;
+    //debug_matrix = true;
+    //debug_keyboard = true;
+    //debug_mouse = true;
     print("debug enabled.\n");
     return;
 }
 
 uint8_t matrix_scan(void)
 {
+    /* extra_key is volatile and more convoluted than necessary because gcc refused
+    to generate valid code otherwise. Making extra_key uint8_t and constructing codes
+    here via codes = extra_key<<8 | 0xFF; would consistently fail to even LOAD
+    extra_key from memory, and leave garbage in the high byte of codes. I tried
+    dozens of code variations and it kept generating broken assembly output. So
+    beware if attempting to make extra_key code more logical and efficient. */
+    static volatile uint16_t extra_key = 0xFFFF;
     uint16_t codes;
     uint8_t key0, key1;
 
-    _matrix_is_modified = false;
-    codes = adb_host_kbd_recv();
+    is_modified = false;
+
+    codes = extra_key;
+    extra_key = 0xFFFF;
+
+    if ( codes == 0xFFFF )
+    {
+        _delay_ms(12);  // delay for preventing overload of poor ADB keyboard controller
+        codes = adb_host_kbd_recv();
+    }
     key0 = codes>>8;
     key1 = codes&0xFF;
 
-#ifdef MATRIX_HAS_LOCKING_CAPS
-    // Send Caps key up event
-    if (matrix_is_on(ROW(CAPS), COL(CAPS))) {
-        _matrix_is_modified = true;
-        _register_key(CAPS_UP);
+    if (debug_matrix && codes) {
+        print("adb_host_kbd_recv: "); phex16(codes); print("\n");
     }
-#endif
+
     if (codes == 0) {                           // no keys
         return 0;
-    } else if (key0 == 0xFF && key1 != 0xFF) {  // error
-        return codes&0xFF;
+    } else if (codes == 0x7F7F) {   // power key press
+        register_key(0x7F);
+    } else if (codes == 0xFFFF) {   // power key release
+        register_key(0xFF);
+    } else if (key0 == 0xFF) {      // error
+        xprintf("adb_host_kbd_recv: ERROR(%d)\n", codes);
+        return key1;
     } else {
-#ifdef MATRIX_HAS_LOCKING_CAPS    
-        if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
-            // Ignore LockingCaps key down event when CAPS LOCK is on
-            if (key0 == CAPS && (key1 == CAPS || key1 == 0xFF)) return 0;
-            if (key0 == CAPS) key0 = key1;
-            if (key1 == CAPS) key1 = 0xFF;
-            // Convert LockingCaps key up event into down event
-            if (key0 == CAPS_UP) key0 = CAPS;
-            if (key1 == CAPS_UP) key1 = CAPS;
-        } else {
-            // CAPS LOCK off:
-            // Ignore LockingCaps key up event when CAPS LOCK is off
-            if (key0 == CAPS_UP && (key1 == CAPS_UP || key1 == 0xFF)) return 0;
-            if (key0 == CAPS_UP) key0 = key1;
-            if (key1 == CAPS_UP) key1 = 0xFF;
-        }
-#endif        
-        _matrix_is_modified = true;
-        _register_key(key0);
+        register_key(key0);
         if (key1 != 0xFF)       // key1 is 0xFF when no second key.
-            _register_key(key1);
+            extra_key = key1<<8 | 0xFF; // process in a separate call
     }
 
-    if (debug_enable) {
-        print("adb_host_kbd_recv: "); phex16(codes); print("\n");
-    }
     return 1;
 }
 
 bool matrix_is_modified(void)
 {
-    return _matrix_is_modified;
+    return is_modified;
 }
 
 inline
@@ -176,10 +168,11 @@ uint16_t matrix_get_row(uint8_t row)
 
 void matrix_print(void)
 {
+    if (!debug_matrix) return;
 #if (MATRIX_COLS <= 8)
-    print("\nr/c 01234567\n");
+    print("r/c 01234567\n");
 #else
-    print("\nr/c 0123456789ABCDEF\n");
+    print("r/c 0123456789ABCDEF\n");
 #endif
     for (uint8_t row = 0; row < matrix_rows(); row++) {
         phex(row); print(": ");
@@ -228,7 +221,7 @@ static bool matrix_has_ghost_in_row(uint8_t row)
 #endif
 
 inline
-static void _register_key(uint8_t key)
+static void register_key(uint8_t key)
 {
     uint8_t col, row;
     col = key&0x07;
@@ -238,4 +231,5 @@ static void _register_key(uint8_t key)
     } else {
         matrix[row] |=  (1<<col);
     }
+    is_modified = true;
 }