diff options
| author | Jun Wako <wakojun@gmail.com> | 2015-04-23 16:33:35 +0900 |
|---|---|---|
| committer | Jun Wako <wakojun@gmail.com> | 2015-04-23 16:33:35 +0900 |
| commit | 4e50df476d2c9050a68b812a7cc1b847cf53070e (patch) | |
| tree | ce0d7e48551cf7c98c365b3bd6af851f47a0b8a6 | |
| parent | bd24de44b71baa036d30da691f56f34744aa5fd5 (diff) | |
| parent | b52e29582aa591eb9abbf131981f750de56e3e21 (diff) | |
| download | qmk_firmware-4e50df476d2c9050a68b812a7cc1b847cf53070e.tar.gz qmk_firmware-4e50df476d2c9050a68b812a7cc1b847cf53070e.zip | |
Merge branch 'mtharp-anti-ghost'
| -rw-r--r-- | tmk_core/common/keyboard.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c index 1e3fb510a4..f0ead604ec 100644 --- a/tmk_core/common/keyboard.c +++ b/tmk_core/common/keyboard.c @@ -87,6 +87,9 @@ void keyboard_init(void) void keyboard_task(void) { static matrix_row_t matrix_prev[MATRIX_ROWS]; +#ifdef MATRIX_HAS_GHOST + static matrix_row_t matrix_ghost[MATRIX_ROWS]; +#endif static uint8_t led_status = 0; matrix_row_t matrix_row = 0; matrix_row_t matrix_change = 0; @@ -96,13 +99,21 @@ void keyboard_task(void) matrix_row = matrix_get_row(r); 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; + /* Keep track of whether ghosted status has changed for + * debugging. But don't update matrix_prev until un-ghosted, or + * the last key would be lost. + */ + if (debug_matrix && matrix_ghost[r] != matrix_row) { + matrix_print(); + } + matrix_ghost[r] = matrix_row; continue; } + matrix_ghost[r] = matrix_row; #endif + if (debug_matrix) matrix_print(); for (uint8_t c = 0; c < MATRIX_COLS; c++) { if (matrix_change & ((matrix_row_t)1<<c)) { action_exec((keyevent_t){ |