aboutsummaryrefslogtreecommitdiff
path: root/keyboards/fortitude60
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/fortitude60
parentfe6b8edd581c334a92a97c15faced95a12d5e882 (diff)
downloadqmk_firmware-faaaa134fd436be400aa2c7841b38907899d49a6.tar.gz
qmk_firmware-faaaa134fd436be400aa2c7841b38907899d49a6.zip
Replace DEBOUNCING_DELAY (deprecated) with DEBOUNCE (#5997)
Diffstat (limited to 'keyboards/fortitude60')
-rw-r--r--keyboards/fortitude60/matrix.c14
-rw-r--r--keyboards/fortitude60/rev1/config.h2
2 files changed, 8 insertions, 8 deletions
diff --git a/keyboards/fortitude60/matrix.c b/keyboards/fortitude60/matrix.c
index 565f417d8..9037d53a6 100644
--- a/keyboards/fortitude60/matrix.c
+++ b/keyboards/fortitude60/matrix.c
@@ -38,11 +38,11 @@ extern backlight_config_t backlight_config;
38 38
39#include "serial.h" 39#include "serial.h"
40 40
41#ifndef DEBOUNCING_DELAY 41#ifndef DEBOUNCE
42# define DEBOUNCING_DELAY 5 42# define DEBOUNCE 5
43#endif 43#endif
44 44
45#if (DEBOUNCING_DELAY > 0) 45#if (DEBOUNCE > 0)
46 static uint16_t debouncing_time; 46 static uint16_t debouncing_time;
47 static bool debouncing = false; 47 static bool debouncing = false;
48#endif 48#endif
@@ -144,7 +144,7 @@ uint8_t _matrix_scan(void)
144#if (DIODE_DIRECTION == COL2ROW) 144#if (DIODE_DIRECTION == COL2ROW)
145 // Set row, read cols 145 // Set row, read cols
146 for (uint8_t current_row = 0; current_row < ROWS_PER_HAND; current_row++) { 146 for (uint8_t current_row = 0; current_row < ROWS_PER_HAND; current_row++) {
147# if (DEBOUNCING_DELAY > 0) 147# if (DEBOUNCE > 0)
148 bool matrix_changed = read_cols_on_row(matrix_debouncing+offset, current_row); 148 bool matrix_changed = read_cols_on_row(matrix_debouncing+offset, current_row);
149 149
150 if (matrix_changed) { 150 if (matrix_changed) {
@@ -161,7 +161,7 @@ uint8_t _matrix_scan(void)
161#elif (DIODE_DIRECTION == ROW2COL) 161#elif (DIODE_DIRECTION == ROW2COL)
162 // Set col, read rows 162 // Set col, read rows
163 for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) { 163 for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
164# if (DEBOUNCING_DELAY > 0) 164# if (DEBOUNCE > 0)
165 bool matrix_changed = read_rows_on_col(matrix_debouncing+offset, current_col); 165 bool matrix_changed = read_rows_on_col(matrix_debouncing+offset, current_col);
166 if (matrix_changed) { 166 if (matrix_changed) {
167 debouncing = true; 167 debouncing = true;
@@ -174,8 +174,8 @@ uint8_t _matrix_scan(void)
174 } 174 }
175#endif 175#endif
176 176
177# if (DEBOUNCING_DELAY > 0) 177# if (DEBOUNCE > 0)
178 if (debouncing && (timer_elapsed(debouncing_time) > DEBOUNCING_DELAY)) { 178 if (debouncing && (timer_elapsed(debouncing_time) > DEBOUNCE)) {
179 for (uint8_t i = 0; i < ROWS_PER_HAND; i++) { 179 for (uint8_t i = 0; i < ROWS_PER_HAND; i++) {
180 matrix[i+offset] = matrix_debouncing[i+offset]; 180 matrix[i+offset] = matrix_debouncing[i+offset];
181 } 181 }
diff --git a/keyboards/fortitude60/rev1/config.h b/keyboards/fortitude60/rev1/config.h
index 2fa179ae2..ad4407a11 100644
--- a/keyboards/fortitude60/rev1/config.h
+++ b/keyboards/fortitude60/rev1/config.h
@@ -51,7 +51,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
51#endif 51#endif
52 52
53/* Set 0 if debouncing isn't needed */ 53/* Set 0 if debouncing isn't needed */
54#define DEBOUNCING_DELAY 5 54#define DEBOUNCE 5
55 55
56/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ 56/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
57#define LOCKING_SUPPORT_ENABLE 57#define LOCKING_SUPPORT_ENABLE