X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;ds=sidebyside;f=converter%2Fibm4704_usb%2Fmatrix.c;h=5b91d49f81debc56baae4162f6eccb1c091234f6;hb=0b14b560063ac23de0132da9aae3cade68f7034e;hp=796e2d06421ac7bd9b6344e499300c6e7d82961b;hpb=ebe951a445b5d774542731d6165a9c5cd56beb2b;p=max%2Ftmk_keyboard.git

diff --git a/converter/ibm4704_usb/matrix.c b/converter/ibm4704_usb/matrix.c
index 796e2d06..5b91d49f 100644
--- a/converter/ibm4704_usb/matrix.c
+++ b/converter/ibm4704_usb/matrix.c
@@ -67,35 +67,34 @@ uint8_t matrix_cols(void)
 
 static void enable_break(void)
 {
-    uint8_t ret;
-    for (uint8_t code = 0; code < 0x80; code++) {
-        while (ibm4704_send(0x80|code) != 0) {
-            print("z");
-        }
-        _delay_ms(1);
-        ret = ibm4704_recv(); 
-        if (ret!=0xFF) {
-            xprintf("%0X: %0X ", code, ret);
-        }
+    print("Enable break: ");
+    while (ibm4704_send(0xFC)) { _delay_ms(10); }
+    // valid scancode: 00-79h
+    for (uint8_t code = 0; code < 0x7F; code++) {
+        while (ibm4704_send(0x80|code)) _delay_ms(10);
+        _delay_ms(5);   // wait for response
+        // No response(FF) when ok, FD when out of bound
+        xprintf("s%02X:r%02X ", code, ibm4704_recv());
     }
-    _delay_us(100);
+    while (ibm4704_send(0xFF)) { _delay_ms(10); } // End
     print("End\n");
-    while (ibm4704_send(0xFF) != 0) {
-        print("Z");
-    } // End
+}
+
+
+void matrix_setup(void)
+{
+    ibm4704_init();
 }
 
 void matrix_init(void)
 {
     debug_enable = true;
 
-    ibm4704_init();
+    print("IBM 4704 converter\n");
     matrix_clear();
-
-    xprintf("------\n");
+    _delay_ms(2000);    // wait for keyboard starting up
+    xprintf("Keyboard ID: %02X\n", ibm4704_recv());
     enable_break();
-    //while (ibm4704_send(0x8C) != 0) ;
-    //while (ibm4704_send(0xFF) != 0) ;
 }
 
 /*
@@ -107,25 +106,21 @@ uint8_t matrix_scan(void)
     if (code==0xFF) {
         // Not receivd
         return 0;
-    } else if ((code&0x78)==0x78) {
-        // 0xFF-F8 and 0x7F-78 is not scan code
-        dprintf("Error: %0X\n", code);
+    } else if ((code&0x7F) >= 0x7A) {
+        // 0xFF-FA and 0x7F-7A is not scancode
+        xprintf("Error: %02X\n", code);
         matrix_clear();
         return 0;
     } else if (code&0x80) {
+        dprintf("%02X\n", code);
         matrix_make(code);
     } else {
+        dprintf("%02X\n", code);
         matrix_break(code);
     }
     return 1;
 }
 
-inline
-bool matrix_has_ghost(void)
-{
-    return false;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
@@ -142,20 +137,8 @@ void matrix_print(void)
 {
     print("\nr/c 01234567\n");
     for (uint8_t row = 0; row < matrix_rows(); row++) {
-        // TODO: use new function
-        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]);
+        xprintf("%02X: %08b\n", row, bitrev(matrix_get_row(row)));
     }
-    return count;
 }