From caed32df808b2ac46b5fd9fcc918fb87762e3c3d Mon Sep 17 00:00:00 2001 From: Jeffrey Sung Date: Tue, 9 Oct 2012 00:28:33 +0900 Subject: [PATCH] Debounce bug fixed --- keyboard/IIgs_Standard/config.h | 2 +- keyboard/IIgs_Standard/matrix.c | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/keyboard/IIgs_Standard/config.h b/keyboard/IIgs_Standard/config.h index 447c9ead..38ac21df 100644 --- a/keyboard/IIgs_Standard/config.h +++ b/keyboard/IIgs_Standard/config.h @@ -44,7 +44,7 @@ along with this program. If not, see . /* define if matrix has ghost */ #define MATRIX_HAS_GHOST /* Set 0 if need no debouncing */ -#define DEBOUNCE 0 +#define DEBOUNCE 5 /* key combination for command */ diff --git a/keyboard/IIgs_Standard/matrix.c b/keyboard/IIgs_Standard/matrix.c index 6cd806e2..6ca55b7e 100644 --- a/keyboard/IIgs_Standard/matrix.c +++ b/keyboard/IIgs_Standard/matrix.c @@ -130,17 +130,23 @@ uint8_t matrix_scan(void) matrix[i] = ~read_col(i) | 0b00010000; // send fake caps lock down } } else { // CAPS LOCK is OFF on HOST - matrix[i] = ~read_col(i); + if (matrix[i] != (uint8_t)~read_col(i)) { + matrix[i] = (uint8_t)~read_col(i); + if (debouncing) { + debug("bounce!: "); debug_hex(debouncing); print("\n"); + } + debouncing = DEBOUNCE; + } } } else { if (matrix[i] != (uint8_t)~read_col(i)) { matrix[i] = (uint8_t)~read_col(i); + if (debouncing) { + debug("bounce!: "); debug_hex(debouncing); print("\n"); + } + debouncing = DEBOUNCE; } } - if (debouncing) { - debug("bounce!: "); debug_hex(debouncing); print("\n"); - } - debouncing = DEBOUNCE; } unselect_rows(); @@ -264,7 +270,6 @@ static uint8_t read_col(uint8_t row) tmp |= (PINF >> 1 ) & 0b00001000; // LEFT GUI is 3bit in modifier (HID Spec) tmp |= (PINA << 4 ) & 0b00010000; // CAPSLOCK tmp |= (PINB << 3 ) & 0b00100000; // POWER - //tmp |= (PINE << 1 ) & 0b00010000; // Caps Lock(Should not be in modifier } else { tmp = 0x00; tmp = (PINE >> 1)&0b00000001; -- 2.46.2