From: Drashna Jaelre Date: Wed, 9 Oct 2019 22:23:57 +0000 (-0700) Subject: Keyboard/ergodox debounce (#6994) X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e58343596af5f749c5bc07aab3a897c6b6b5ac99;p=qmk_firmware.git Keyboard/ergodox debounce (#6994) * Set default debounce to 30 Lower debounce causes issues, and even 15 isn't lowe enough for the EZ * Cleanup ergodox ez matrix --- diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h index c35fe7394..bb51ec321 100644 --- a/keyboards/ergodox_ez/config.h +++ b/keyboards/ergodox_ez/config.h @@ -40,6 +40,8 @@ along with this program. If not, see . #define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_WHEEL_DELAY 0 +#define DEBOUNCE 30 + #define TAPPING_TOGGLE 1 /* define if matrix has ghost */ diff --git a/keyboards/ergodox_ez/matrix.c b/keyboards/ergodox_ez/matrix.c index 2bfe27b9a..3c9a2f43a 100644 --- a/keyboards/ergodox_ez/matrix.c +++ b/keyboards/ergodox_ez/matrix.c @@ -31,6 +31,12 @@ along with this program. If not, see . #include "matrix.h" #include "debounce.h" #include QMK_KEYBOARD_H + +// Only enable this if console is enabled to print to +#if defined(DEBUG_MATRIX_SCAN_RATE) && !defined(CONSOLE_ENABLE) +# undef DEBUG_MATRIX_SCAN_RATE +#endif + #ifdef DEBUG_MATRIX_SCAN_RATE # include "timer.h" #endif @@ -47,10 +53,6 @@ along with this program. If not, see . * that comment was written.) */ -#ifndef DEBOUNCE -# define DEBOUNCE 5 -#endif - /* matrix state(1:on, 0:off) */ static matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values static matrix_row_t matrix[MATRIX_ROWS]; // debounced values