From: tmk Date: Tue, 5 Mar 2013 10:18:01 +0000 (+0900) Subject: Fix ghost block and remove matrix_has_ghost() X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=9e9a85c1426650148d0d83c900e432003ff174fb;p=max%2Ftmk_keyboard.git Fix ghost block and remove matrix_has_ghost() --- diff --git a/common/keyboard.c b/common/keyboard.c index 432ea893..91f321d9 100644 --- a/common/keyboard.c +++ b/common/keyboard.c @@ -34,6 +34,24 @@ along with this program. If not, see . #endif +#ifdef MATRIX_HAS_GHOST +static bool has_ghost_in_row(uint8_t row) +{ + matrix_row_t matrix_row = matrix_get_row(row); + // No ghost exists when less than 2 keys are down on the row + if (((matrix_row - 1) & matrix_row) == 0) + return false; + + // Ghost occurs when the row shares column line with other row + for (uint8_t i=0; i < MATRIX_ROWS; i++) { + if (i != row && (matrix_get_row(i) & matrix_row)) + return true; + } + return false; +} +#endif + + void keyboard_init(void) { // TODO: configuration of sendchar impl @@ -81,7 +99,12 @@ void keyboard_task(void) matrix_change = matrix_row ^ matrix_prev[r]; if (matrix_change) { if (debug_matrix) matrix_print(); - +#ifdef MATRIX_HAS_GHOST + if (has_ghost_in_row(r)) { + matrix_prev[r] = matrix_row; + continue; + } +#endif for (uint8_t c = 0; c < MATRIX_COLS; c++) { if (matrix_change & ((matrix_row_t)1<