summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2019-10-09 15:23:57 -0700
committerJoel Challis <git@zvecr.com>2019-10-09 23:23:57 +0100
commite58343596af5f749c5bc07aab3a897c6b6b5ac99 (patch)
tree2ff77436267f97a9c09f9999f597dca480daea2a /keyboards
parent4e23c700f19c8bf0da1fe810721fb02731591f49 (diff)
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
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/ergodox_ez/config.h2
-rw-r--r--keyboards/ergodox_ez/matrix.c10
2 files changed, 8 insertions, 4 deletions
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h
index c35fe73941..bb51ec3215 100644
--- a/keyboards/ergodox_ez/config.h
+++ b/keyboards/ergodox_ez/config.h
@@ -40,6 +40,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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 2bfe27b9a3..3c9a2f43a7 100644
--- a/keyboards/ergodox_ez/matrix.c
+++ b/keyboards/ergodox_ez/matrix.c
@@ -31,6 +31,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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 <http://www.gnu.org/licenses/>.
* 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