diff options
| author | alex-ong <the.onga@gmail.com> | 2019-01-26 23:21:27 +1100 |
|---|---|---|
| committer | alex-ong <the.onga@gmail.com> | 2019-01-26 23:21:27 +1100 |
| commit | 503e02db79c06f7893e6802eb1a2ab2850a931f1 (patch) | |
| tree | 4abfa85ee217b29b85bc8b808ab380edeaeaf445 | |
| parent | 10cc4235155d0a039faf2dc5c2b1ebe513952c3c (diff) | |
| parent | d30d5eeb27b7dc66ef18e65dc150cf76121a7148 (diff) | |
Merge branch 'debounce_refactor' of https://github.com/alex-ong/qmk_firmware into debounce_refactor
| -rw-r--r-- | common_features.mk | 6 | ||||
| -rw-r--r-- | keyboards/handwired/xealous/rules.mk | 2 | ||||
| -rw-r--r-- | quantum/debounce.h | 2 | ||||
| -rw-r--r-- | quantum/debounce/debounce_sym_g.c | 6 |
4 files changed, 7 insertions, 9 deletions
diff --git a/common_features.mk b/common_features.mk index 2c86fd31b0..8e2747d5a4 100644 --- a/common_features.mk +++ b/common_features.mk @@ -265,11 +265,11 @@ endif DEBOUNCE_DIR:= $(QUANTUM_DIR)/debounce # Debounce Modules. If implemented in matrix.c, don't use these. -ifeq ($(strip $(DEBOUNCE_ALGO)), manual) +ifeq ($(strip $(DEBOUNCE_TYPE)), custom) # Do nothing. do your debouncing in matrix.c -else ifeq ($(strip $(DEBOUNCE_ALGO)), sym_g) +else ifeq ($(strip $(DEBOUNCE_TYPE)), sym_g) QUANTUM_SRC += $(DEBOUNCE_DIR)/debounce_sym_g.c -else ifeq ($(strip $(DEBOUNCE_ALGO)), eager_pk) +else ifeq ($(strip $(DEBOUNCE_TYPE)), eager_pk) QUANTUM_SRC += $(DEBOUNCE_DIR)/debounce_eager_pk.c else # default algorithm. Won't be used if we have a custom_matrix that doesn't utilize it QUANTUM_SRC += $(DEBOUNCE_DIR)/debounce_sym_g.c diff --git a/keyboards/handwired/xealous/rules.mk b/keyboards/handwired/xealous/rules.mk index 37afdaff93..7d07c9aa5f 100644 --- a/keyboards/handwired/xealous/rules.mk +++ b/keyboards/handwired/xealous/rules.mk @@ -68,7 +68,7 @@ SUBPROJECT_rev1 = yes SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend CUSTOM_MATRIX = no -DEBOUNCE_ALGO = manual +DEBOUNCE_TYPE = custom LAYOUTS = split60 diff --git a/quantum/debounce.h b/quantum/debounce.h index 8397823ebb..9ca05c6824 100644 --- a/quantum/debounce.h +++ b/quantum/debounce.h @@ -1,7 +1,5 @@ #pragma once -#include "matrix.h" - // raw is the current key state // on entry cooked is the previous debounced state // on exit cooked is the current debounced state diff --git a/quantum/debounce/debounce_sym_g.c b/quantum/debounce/debounce_sym_g.c index e365cdf037..c8ab34e1a0 100644 --- a/quantum/debounce/debounce_sym_g.c +++ b/quantum/debounce/debounce_sym_g.c @@ -16,9 +16,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. Basic global debounce algorithm. Used in 99% of keyboards at time of implementation When no state changes have occured for DEBOUNCE milliseconds, we push the state. */ -#include "debounce.h" #include "matrix.h" #include "timer.h" +#include "quantum.h" #ifndef DEBOUNCE #define DEBOUNCE 5 #endif @@ -45,13 +45,13 @@ void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool #else //no debouncing. void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed) { - for (int i = 0; i < MATRIX_ROWS; i++) { + for (int i = 0; i < num_rows; i++) { cooked[i] = raw[i]; } } #endif -bool debounce_active() { +bool debounce_active(void) { return debouncing; } |