summaryrefslogtreecommitdiffstats
path: root/keyboards/ergo42
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2019-06-06 12:09:56 -0700
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-06-06 12:09:56 -0700
commitfaaaa134fd436be400aa2c7841b38907899d49a6 (patch)
tree9deaea82d250f349b314ec89d369f068ddd75489 /keyboards/ergo42
parentfe6b8edd581c334a92a97c15faced95a12d5e882 (diff)
Replace DEBOUNCING_DELAY (deprecated) with DEBOUNCE (#5997)
Diffstat (limited to 'keyboards/ergo42')
-rw-r--r--keyboards/ergo42/matrix.c14
-rw-r--r--keyboards/ergo42/rev1/config.h2
2 files changed, 8 insertions, 8 deletions
diff --git a/keyboards/ergo42/matrix.c b/keyboards/ergo42/matrix.c
index fc42dd14d9..328d16c77b 100644
--- a/keyboards/ergo42/matrix.c
+++ b/keyboards/ergo42/matrix.c
@@ -37,11 +37,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# include "serial.h"
#endif
-#ifndef DEBOUNCING_DELAY
-# define DEBOUNCING_DELAY 5
+#ifndef DEBOUNCE
+# define DEBOUNCE 5
#endif
-#if (DEBOUNCING_DELAY > 0)
+#if (DEBOUNCE > 0)
static uint16_t debouncing_time;
static bool debouncing = false;
#endif
@@ -145,7 +145,7 @@ uint8_t _matrix_scan(void)
#if (DIODE_DIRECTION == COL2ROW)
// Set row, read cols
for (uint8_t current_row = 0; current_row < ROWS_PER_HAND; current_row++) {
-# if (DEBOUNCING_DELAY > 0)
+# if (DEBOUNCE > 0)
bool matrix_changed = read_cols_on_row(matrix_debouncing+offset, current_row);
if (matrix_changed) {
@@ -162,7 +162,7 @@ uint8_t _matrix_scan(void)
#elif (DIODE_DIRECTION == ROW2COL)
// Set col, read rows
for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
-# if (DEBOUNCING_DELAY > 0)
+# if (DEBOUNCE > 0)
bool matrix_changed = read_rows_on_col(matrix_debouncing+offset, current_col);
if (matrix_changed) {
debouncing = true;
@@ -175,8 +175,8 @@ uint8_t _matrix_scan(void)
}
#endif
-# if (DEBOUNCING_DELAY > 0)
- if (debouncing && (timer_elapsed(debouncing_time) > DEBOUNCING_DELAY)) {
+# if (DEBOUNCE > 0)
+ if (debouncing && (timer_elapsed(debouncing_time) > DEBOUNCE)) {
for (uint8_t i = 0; i < ROWS_PER_HAND; i++) {
matrix[i+offset] = matrix_debouncing[i+offset];
}
diff --git a/keyboards/ergo42/rev1/config.h b/keyboards/ergo42/rev1/config.h
index f9d909cc7e..68a5e2bbe5 100644
--- a/keyboards/ergo42/rev1/config.h
+++ b/keyboards/ergo42/rev1/config.h
@@ -52,7 +52,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define BACKLIGHT_LEVELS 3
/* Set 0 if debouncing isn't needed */
-#define DEBOUNCING_DELAY 5
+#define DEBOUNCE 5
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE