X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=keyboard%2Fgh60%2Fmatrix.c;h=85e58fe3615c8b9c993a13c017e8cacc4da8f990;hb=0142b571c46c7db314063615c956cbc5ec9720f1;hp=4c18a61912af3e079c7e5a76a44252a9b8e16435;hpb=c009f4643c17084b8f632b3292e0c7962b324ae5;p=max%2Ftmk_keyboard.git

diff --git a/keyboard/gh60/matrix.c b/keyboard/gh60/matrix.c
index 4c18a619..85e58fe3 100644
--- a/keyboard/gh60/matrix.c
+++ b/keyboard/gh60/matrix.c
@@ -33,11 +33,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 static uint8_t debouncing = DEBOUNCE;
 
-// matrix state buffer(1:on, 0:off)
+/* matrix state(1:on, 0:off) */
 static uint16_t *matrix;
-static uint16_t *matrix_prev;
-static uint16_t _matrix0[MATRIX_ROWS];
-static uint16_t _matrix1[MATRIX_ROWS];
+static uint16_t *matrix_debouncing;
+static uint16_t matrix0[MATRIX_ROWS];
+static uint16_t matrix1[MATRIX_ROWS];
+static bool is_modified;
 
 static uint16_t read_cols(void);
 static void init_cols(void);
@@ -64,38 +65,42 @@ void matrix_init(void)
     init_cols();
 
     // initialize matrix state: all keys off
-    for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0;
-    for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0;
-    matrix = _matrix0;
-    matrix_prev = _matrix1;
+    matrix = matrix0;
+    matrix_debouncing = matrix1;
+    for (uint8_t i=0; i < MATRIX_ROWS; i++) {
+        matrix[i] = 0;
+        matrix_debouncing[i] = 0;
+    }
+    is_modified = false;
 }
 
 uint8_t matrix_scan(void)
 {
-    if (!debouncing) {
-        uint16_t *tmp = matrix_prev;
-        matrix_prev = matrix;
-        matrix = tmp;
-    }
-
     for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        unselect_rows();
+        //unselect_rows();
         select_row(i);
-        _delay_us(1);  // without this wait read unstable value.
-        uint16_t cols = ~read_cols();
-        if (matrix[i] != cols) {
-            matrix[i] = cols;
+        _delay_us(30);  // without this wait read unstable value.
+        uint16_t cols = read_cols();
+        if (matrix_debouncing[i] != cols) {
+            matrix_debouncing[i] = cols;
             if (debouncing) {
-                debug("bounce!: "); debug_hex(debouncing); print("\n");
+                debug("bounce!: "); debug_hex(debouncing); debug("\n");
             }
             debouncing = DEBOUNCE;
+            is_modified = false;
         }
+        unselect_rows();
     }
-    unselect_rows();
+    //unselect_rows();
 
     if (debouncing) {
         debouncing--;
-        _delay_ms(1); // improved affect on bouncing
+        _delay_ms(1);
+    } else {
+        uint16_t *tmp = matrix;
+        matrix = matrix_debouncing;
+        matrix_debouncing = tmp;
+        is_modified = true;
     }
 
     return 1;
@@ -103,13 +108,7 @@ uint8_t matrix_scan(void)
 
 bool matrix_is_modified(void)
 {
-    if (debouncing) return false;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        if (matrix[i] != matrix_prev[i]) {
-            return true;
-        }
-    }
-    return false;
+    return is_modified;
 }
 
 inline
@@ -132,7 +131,7 @@ uint16_t matrix_get_row(uint8_t row)
 
 void matrix_print(void)
 {
-    print("\nr/c 01234567\n");
+    print("\nr/c 0123456789ABCDEF\n");
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
         phex(row); print(": ");
         pbin_reverse16(matrix_get_row(row));
@@ -170,20 +169,20 @@ static void  init_cols(void)
 
 static uint16_t read_cols(void)
 {
-    return (PINF&(1<<0) ? (1<<0)  : 0) |
-           (PINF&(1<<1) ? (1<<1)  : 0) |
-           (PINE&(1<<6) ? (1<<2)  : 0) |
-           (PINC&(1<<7) ? (1<<3)  : 0) |
-           (PINC&(1<<6) ? (1<<4)  : 0) |
-           (PINB&(1<<6) ? (1<<5)  : 0) |
-           (PIND&(1<<4) ? (1<<6)  : 0) |
-           (PINB&(1<<1) ? (1<<7)  : 0) |
-           (PINB&(1<<0) ? (1<<8)  : 0) |
-           (PINB&(1<<5) ? (1<<9)  : 0) |
-           (PINB&(1<<4) ? (1<<10) : 0) |
-           (PIND&(1<<7) ? (1<<11) : 0) |
-           (PIND&(1<<6) ? (1<<12) : 0) |
-           (PINB&(1<<3) ? (1<<13) : 0);
+    return (PINF&(1<<0) ? 0 : (1<<0)) |
+           (PINF&(1<<1) ? 0 : (1<<1)) |
+           (PINE&(1<<6) ? 0 : (1<<2)) |
+           (PINC&(1<<7) ? 0 : (1<<3)) |
+           (PINC&(1<<6) ? 0 : (1<<4)) |
+           (PINB&(1<<6) ? 0 : (1<<5)) |
+           (PIND&(1<<4) ? 0 : (1<<6)) |
+           (PINB&(1<<1) ? 0 : (1<<7)) |
+           (PINB&(1<<0) ? 0 : (1<<8)) |
+           (PINB&(1<<5) ? 0 : (1<<9)) |
+           (PINB&(1<<4) ? 0 : (1<<10)) |
+           (PIND&(1<<7) ? 0 : (1<<11)) |
+           (PIND&(1<<6) ? 0 : (1<<12)) |
+           (PINB&(1<<3) ? 0 : (1<<13));
 }
 
 /* Row pin configuration