Fix debouncing on gh60, hbkb, macway

diff --git a/keyboard/gh60/matrix.c b/keyboard/gh60/matrix.c
index 3ba6801fbfabafe9b7d913caab99b39288f69231..a2bd70e4b78fd60c92861a5bd507db0d72678e3a 100644 (file)
--- a/keyboard/gh60/matrix.c
+++ b/keyboard/gh60/matrix.c
@@ -34,10 +34,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 static uint8_t debouncing = DEBOUNCE;
 
 /* matrix state(1:on, 0:off) */
-static matrix_row_t *matrix;
-static matrix_row_t *matrix_debouncing;
-static matrix_row_t matrix0[MATRIX_ROWS];
-static matrix_row_t matrix1[MATRIX_ROWS];
+static matrix_row_t matrix[MATRIX_ROWS];
+static matrix_row_t matrix_debouncing[MATRIX_ROWS];
 
 static matrix_row_t read_cols(void);
 static void init_cols(void);
@@ -64,8 +62,6 @@ void matrix_init(void)
     init_cols();
 
     // initialize matrix state: all keys off
-    matrix = matrix0;
-    matrix_debouncing = matrix1;
     for (uint8_t i=0; i < MATRIX_ROWS; i++) {
         matrix[i] = 0;
         matrix_debouncing[i] = 0;
@@ -92,9 +88,9 @@ uint8_t matrix_scan(void)
         if (--debouncing) {
             _delay_ms(1);
         } else {
-            matrix_row_t *tmp = matrix;
-            matrix = matrix_debouncing;
-            matrix_debouncing = tmp;
+            for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+                matrix[i] = matrix_debouncing[i];
+            }
         }
     }
 

diff --git a/keyboard/hbkb/Makefile.lufa b/keyboard/hbkb/Makefile.lufa
index 33366d720889c889db972bc5c509d9c59e590f83..a626d476c8733af9d322f7776c41baa41cb392ff 100644 (file)
--- a/keyboard/hbkb/Makefile.lufa
+++ b/keyboard/hbkb/Makefile.lufa
@@ -97,11 +97,11 @@ F_USB = $(F_CPU)
 # Build Options
 #   comment out to disable the options.
 #
+BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes  # Mouse keys
 EXTRAKEY_ENABLE = yes  # Audio control and System control
 CONSOLE_ENABLE = yes   # Console for debug
-#NKRO_ENABLE = yes     # USB Nkey Rollover
-#PS2_MOUSE_ENABLE = yes        # PS/2 mouse(TrackPoint) support
+COMMAND_ENABLE = yes    # Commands for debug and configuration
 
 
 # Boot Section Size in bytes

diff --git a/keyboard/hbkb/config.h b/keyboard/hbkb/config.h
index aa3af30c14f472d3e705fea4805cd6c81457c251..b31a865382ceefe419af67ba271b85b43a4c607c 100644 (file)
--- a/keyboard/hbkb/config.h
+++ b/keyboard/hbkb/config.h
@@ -37,7 +37,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_HAS_GHOST
 
 /* Set 0 if need no debouncing */
-#define DEBOUNCE    10
+#define DEBOUNCE    5
 
 /* legacy keymap support */
 #define USE_LEGACY_KEYMAP

diff --git a/keyboard/hbkb/matrix.c b/keyboard/hbkb/matrix.c
index f6830a0f71f81981c4f985d092b7d10e837dd058..ee32312d9a2de3431618c3a3ca550f62e8490b6b 100644 (file)
--- a/keyboard/hbkb/matrix.c
+++ b/keyboard/hbkb/matrix.c
@@ -37,16 +37,14 @@ 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)
-static uint8_t *matrix;
-static uint8_t *matrix_debouncing;
-static uint8_t matrix0[MATRIX_ROWS];
-static uint8_t matrix1[MATRIX_ROWS];
+/* matrix state(1:on, 0:off) */
+static matrix_row_t matrix[MATRIX_ROWS];
+static matrix_row_t matrix_debouncing[MATRIX_ROWS];
 
 #ifdef MATRIX_HAS_GHOST
 static bool matrix_has_ghost_in_row(uint8_t row);
 #endif
-static uint8_t read_col(void);
+static matrix_row_t read_cols(void);
 static void unselect_rows(void);
 static void select_row(uint8_t row);
 
@@ -65,13 +63,6 @@ uint8_t matrix_cols(void)
 
 void matrix_init(void)
 {
-    print_enable = true;
-    debug_enable = true;
-    debug_matrix = true;
-    debug_keyboard = false;
-    debug_mouse = false;
-    print("debug enabled.\n");
-
     // JTAG disable for PORT F. write JTD bit twice within four cycles.
     MCUCR |= (1<<JTD);
     MCUCR |= (1<<JTD);
@@ -84,10 +75,10 @@ void matrix_init(void)
     PORTD = 0xFF;
 
     // initialize matrix state: all keys off
-    for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix0[i] = 0x00;
-    for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix1[i] = 0x00;
-    matrix = matrix0;
-    matrix_debouncing = matrix1;
+    for (uint8_t i=0; i < MATRIX_ROWS; i++) {
+        matrix[i] = 0;
+        matrix_debouncing[i] = 0;
+    }
 }
 
 uint8_t matrix_scan(void)
@@ -95,8 +86,9 @@ uint8_t matrix_scan(void)
     for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
         select_row(i);
         _delay_us(30);  // without this wait read unstable value.
-        if (matrix_debouncing[i] != read_col()) {
-            matrix_debouncing[i] = read_col();
+        matrix_row_t cols = read_cols();
+        if (matrix_debouncing[i] != cols) {
+            matrix_debouncing[i] = cols;
             if (debouncing) {
                 debug("bounce!: "); debug_hex(debouncing); debug("\n");
             }
@@ -109,9 +101,9 @@ uint8_t matrix_scan(void)
         if (--debouncing) {
             _delay_ms(1);
         } else {
-            uint8_t *tmp = matrix;
-            matrix = matrix_debouncing;
-            matrix_debouncing = tmp;
+            for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+                matrix[i] = matrix_debouncing[i];
+            }
         }
     }
 
@@ -127,15 +119,11 @@ bool matrix_is_modified(void)
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
-    return (matrix[row] & (1<<col));
+    return (matrix[row] & ((matrix_row_t)1<<col));
 }
 
 inline
-#if (MATRIX_COLS <= 8)
-uint8_t matrix_get_row(uint8_t row)
-#else
-uint16_t matrix_get_row(uint8_t row)
-#endif
+matrix_row_t matrix_get_row(uint8_t row)
 {
     return matrix[row];
 }
@@ -145,11 +133,7 @@ void matrix_print(void)
     print("\nr/c 01234567\n");
     for (uint8_t row = 0; row < matrix_rows(); row++) {
         phex(row); print(": ");
-#if (MATRIX_COLS <= 8)
         pbin_reverse(matrix_get_row(row));
-#else
-        pbin_reverse16(matrix_get_row(row));
-#endif
 #ifdef MATRIX_HAS_GHOST
         if (matrix_has_ghost_in_row(row)) {
             print(" <ghost");
@@ -177,7 +161,7 @@ static bool matrix_has_ghost_in_row(uint8_t row)
 #endif
 
 inline
-static uint8_t read_col(void)
+static matrix_row_t read_cols(void)
 {
     return ~PIND;
 }

diff --git a/keyboard/macway/Makefile.lufa b/keyboard/macway/Makefile.lufa
index 1f365da112c64987ea057f35a07087b15f16466f..f0acf76713b4cc4beb3e058d9480db7d6f0744a5 100644 (file)
--- a/keyboard/macway/Makefile.lufa
+++ b/keyboard/macway/Makefile.lufa
@@ -97,11 +97,12 @@ F_USB = $(F_CPU)
 # Build Options
 #   comment out to disable the options.
 #
+BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes  # Mouse keys
 EXTRAKEY_ENABLE = yes  # Audio control and System control
 CONSOLE_ENABLE = yes   # Console for debug
+COMMAND_ENABLE = yes    # Commands for debug and configuration
 #NKRO_ENABLE = yes     # USB Nkey Rollover
-#PS2_MOUSE_ENABLE = yes        # PS/2 mouse(TrackPoint) support
 
 
 # Boot Section Size in bytes

diff --git a/keyboard/macway/Makefile.pjrc b/keyboard/macway/Makefile.pjrc
index ecc236e3d07248799711bc3b00a47b8963d81fcd..9e84a34185eb60271144db25cf90f707946d1746 100644 (file)
--- a/keyboard/macway/Makefile.pjrc
+++ b/keyboard/macway/Makefile.pjrc
@@ -74,9 +74,11 @@ F_CPU = 16000000
 # Build Options
 #   comment out to disable the options.
 #
+BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes  # Mouse keys
 #PS2_MOUSE_ENABLE = yes        # PS/2 mouse(TrackPoint) support
 EXTRAKEY_ENABLE = yes  # Audio control and System control
+COMMAND_ENABLE = yes    # Commands for debug and configuration
 #NKRO_ENABLE = yes     # USB Nkey Rollover
 
 

diff --git a/keyboard/macway/matrix.c b/keyboard/macway/matrix.c
index 0f57bfeae70e870bd5da48387ff56f0fe847021e..3d10b304d477ecb8f8614794fef20dd11aa22325 100644 (file)
--- a/keyboard/macway/matrix.c
+++ b/keyboard/macway/matrix.c
@@ -28,29 +28,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "matrix.h"
 
 
-#if (MATRIX_COLS > 16)
-#   error "MATRIX_COLS must not exceed 16"
-#endif
-#if (MATRIX_ROWS > 255)
-#   error "MATRIX_ROWS must not exceed 255"
-#endif
-
-
 #ifndef DEBOUNCE
 #   define DEBOUNCE    5
 #endif
 static uint8_t debouncing = DEBOUNCE;
 
-// matrix state buffer(1:on, 0:off)
-static matrix_row_t *matrix;
-static matrix_row_t *matrix_debouncing;
-static matrix_row_t matrix0[MATRIX_ROWS];
-static matrix_row_t matrix1[MATRIX_ROWS];
+/* matrix state(1:on, 0:off) */
+static matrix_row_t matrix[MATRIX_ROWS];
+static matrix_row_t matrix_debouncing[MATRIX_ROWS];
 
 #ifdef MATRIX_HAS_GHOST
 static bool matrix_has_ghost_in_row(uint8_t row);
 #endif
-static matrix_row_t read_col(void);
+static matrix_row_t read_cols(void);
 static void unselect_rows(void);
 static void select_row(uint8_t row);
 
@@ -77,36 +67,34 @@ void matrix_init(void)
 
     // initialize matrix state: all keys off
     for (uint8_t i=0; i < MATRIX_ROWS; i++) {
-        matrix0[i] = 0;
-        matrix1[i] = 0;
+        matrix[i] = 0;
+        matrix_debouncing[i] = 0;
     }
-    matrix = matrix0;
-    matrix_debouncing = matrix1;
 }
 
 uint8_t matrix_scan(void)
 {
     for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        unselect_rows();
         select_row(i);
         _delay_us(30);  // without this wait read unstable value.
-        if (matrix[i] != read_col()) {
-            matrix[i] = read_col();
+        matrix_row_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;
         }
+        unselect_rows();
     }
-    unselect_rows();
 
     if (debouncing) {
         if (--debouncing) {
             _delay_ms(1);
         } else {
-            matrix_row_t *tmp = matrix;
-            matrix = matrix_debouncing;
-            matrix_debouncing = tmp;
+            for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+                matrix[i] = matrix_debouncing[i];
+            }
         }
 
     }
@@ -123,7 +111,7 @@ bool matrix_is_modified(void)
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
-    return (matrix[row] & (1<<col));
+    return (matrix[row] & ((matrix_row_t)1<<col));
 }
 
 inline
@@ -137,11 +125,7 @@ void matrix_print(void)
     print("\nr/c 01234567\n");
     for (uint8_t row = 0; row < matrix_rows(); row++) {
         phex(row); print(": ");
-#if (MATRIX_COLS <= 8)
         pbin_reverse(matrix_get_row(row));
-#else
-        pbin_reverse16(matrix_get_row(row));
-#endif
 #ifdef MATRIX_HAS_GHOST
         if (matrix_has_ghost_in_row(row)) {
             print(" <ghost");
@@ -151,19 +135,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-#if (MATRIX_COLS <= 8)
-        count += bitpop(matrix[i]);
-#else
-        count += bitpop16(matrix[i]);
-#endif
-    }
-    return count;
-}
-
 #ifdef MATRIX_HAS_GHOST
 inline
 static bool matrix_has_ghost_in_row(uint8_t row)
@@ -174,7 +145,7 @@ static bool matrix_has_ghost_in_row(uint8_t row)
 
     // ghost exists in case same state as other row
     for (uint8_t i=0; i < MATRIX_ROWS; i++) {
-        if (i != row && (matrix[i] & matrix[row]) == matrix[row])
+        if (i != row && (matrix[i] & matrix[row]))
             return true;
     }
     return false;
@@ -182,7 +153,7 @@ static bool matrix_has_ghost_in_row(uint8_t row)
 #endif
 
 inline
-static matrix_row_t read_col(void)
+static matrix_row_t read_cols(void)
 {
     return ~PINB;
 }