From 2795b7a0a30c351a85f17cb4c0b414297e096282 Mon Sep 17 00:00:00 2001 From: tmk Date: Wed, 27 Mar 2013 17:15:06 +0900 Subject: Fix debouncing on gh60, hbkb, macway --- keyboard/gh60/matrix.c | 14 ++++------ keyboard/hbkb/Makefile.lufa | 4 +-- keyboard/hbkb/config.h | 2 +- keyboard/hbkb/matrix.c | 50 ++++++++++++---------------------- keyboard/macway/Makefile.lufa | 3 ++- keyboard/macway/Makefile.pjrc | 2 ++ keyboard/macway/matrix.c | 63 ++++++++++++------------------------------- 7 files changed, 46 insertions(+), 92 deletions(-) diff --git a/keyboard/gh60/matrix.c b/keyboard/gh60/matrix.c index 3ba6801fb..a2bd70e4b 100644 --- a/keyboard/gh60/matrix.c +++ b/keyboard/gh60/matrix.c @@ -34,10 +34,8 @@ along with this program. If not, see . 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 33366d720..a626d476c 100644 --- 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 aa3af30c1..b31a86538 100644 --- a/keyboard/hbkb/config.h +++ b/keyboard/hbkb/config.h @@ -37,7 +37,7 @@ along with this program. If not, see . #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 f6830a0f7..ee32312d9 100644 --- a/keyboard/hbkb/matrix.c +++ b/keyboard/hbkb/matrix.c @@ -37,16 +37,14 @@ along with this program. If not, see . #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<. #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<