Merge branch 'console_ringbuf_fix'

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

diff --git a/converter/sun_usb/matrix.c b/converter/sun_usb/matrix.c
index c1e98257d9876efaf082e251c9a24511e080fdc5..0cea3700c6e185a8c413f554cc245eb2701f774b 100644 (file)
--- a/converter/sun_usb/matrix.c
+++ b/converter/sun_usb/matrix.c
@@ -21,9 +21,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <util/delay.h>
 #include "print.h"
 #include "util.h"
-#include "serial.h"
 #include "matrix.h"
 #include "debug.h"
+#include "protocol/serial.h"
+#include "led.h"
+#include "host.h"
 
 
 /*
@@ -41,140 +43,94 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *  E|70 ... 77|
  *  F|78 ... 7F|
  *   +---------+
- *
- * Command From System To Keyboard
- * 0x01 Reset
- * 0x02 Bell On
- * 0x03 Bell Off
- * 0x0A Click On
- * 0x0B Click Off
- * 0x0E LED
- * 0x0F Layout
- *
- * Command From Keyboard To System
- * 0x7F Idle
- * 0xFE Layout Response
- * 0xFF Reset Response(followed by 0x04)
- *
- * bit: 3       2       1       0
- * LED: CapsLk  ScrLk   Compose NumLk
- *      
- * Connector
- *   8Pin mini DIN
- *      8  7  6
- *     5    4  3
- *       2   1
- *     receptacle
- *
- * 1: GND
- * 2: GND
- * 3: 5V
- * 4: RX/TX(Mouse)
- * 5: RX
- * 6: TX
- * 7: GND
- * 8: 5V
  */
 static uint8_t matrix[MATRIX_ROWS];
 #define ROW(code)      ((code>>3)&0xF)
 #define COL(code)      (code&0x07)
 
-static bool is_modified = false;
-
-
-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;
+    DDRD |= (1<<6);
+    PORTD |= (1<<6);
+    //debug_enable = true;
 
     serial_init();
 
     // initialize matrix state: all keys off
     for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
 
+    // wait for keyboard coming up
+    // otherwise LED status update fails
+    print("Reseting ");
+    while (1) {
+        print(".");
+        while (serial_recv());
+        serial_send(0x01);
+        _delay_ms(500);
+        if (serial_recv() == 0xFF) {
+            _delay_ms(500);
+            if (serial_recv() == 0x04)
+                break;
+        }
+    }
+    print(" Done\n");
+
+    PORTD &= ~(1<<6);
     return;
 }
 
 uint8_t matrix_scan(void)
 {
-    is_modified = false;
-
     uint8_t code;
     code = serial_recv();
-    if (code == 0) {
-        return 0;
+    if (!code) return 0;
+
+    debug_hex(code); debug(" ");
+
+    switch (code) {
+        case 0xFF:  // reset success: FF 04
+            print("reset: ");
+            _delay_ms(500);
+            code = serial_recv();
+            xprintf("%02X\n", code);
+            if (code == 0x04) {
+                // LED status
+                led_set(host_keyboard_leds());
+            }
+            return 0;
+        case 0xFE:  // layout: FE <layout>
+            print("layout: ");
+            _delay_ms(500);
+            xprintf("%02X\n", serial_recv());
+            return 0;
+        case 0x7E:  // reset fail: 7E 01
+            print("reset fail: ");
+            _delay_ms(500);
+            xprintf("%02X\n", serial_recv());
+            return 0;
+        case 0x7F:
+            // all keys up
+            for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
+            return 0;
     }
 
-    phex(code); print("(");
-    code = ~code;
-    phex(code); print(")");
-return 0;
     if (code&0x80) {
         // break code
         if (matrix_is_on(ROW(code), COL(code))) {
             matrix[ROW(code)] &= ~(1<<COL(code));
-            is_modified = true;
         }
     } else {
         // make code
         if (!matrix_is_on(ROW(code), COL(code))) {
             matrix[ROW(code)] |=  (1<<COL(code));
-            is_modified = true;
         }
     }
     return code;
 }
 
-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;
-}