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 /common_features.mk | |
| parent | 10cc4235155d0a039faf2dc5c2b1ebe513952c3c (diff) | |
| parent | d30d5eeb27b7dc66ef18e65dc150cf76121a7148 (diff) | |
| download | qmk_firmware-503e02db79c06f7893e6802eb1a2ab2850a931f1.tar.gz qmk_firmware-503e02db79c06f7893e6802eb1a2ab2850a931f1.zip | |
Merge branch 'debounce_refactor' of https://github.com/alex-ong/qmk_firmware into debounce_refactor
Diffstat (limited to 'common_features.mk')
| -rw-r--r-- | common_features.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common_features.mk b/common_features.mk index 2c86fd31b..8e2747d5a 100644 --- a/common_features.mk +++ b/common_features.mk | |||
| @@ -265,11 +265,11 @@ endif | |||
| 265 | 265 | ||
| 266 | DEBOUNCE_DIR:= $(QUANTUM_DIR)/debounce | 266 | DEBOUNCE_DIR:= $(QUANTUM_DIR)/debounce |
| 267 | # Debounce Modules. If implemented in matrix.c, don't use these. | 267 | # Debounce Modules. If implemented in matrix.c, don't use these. |
| 268 | ifeq ($(strip $(DEBOUNCE_ALGO)), manual) | 268 | ifeq ($(strip $(DEBOUNCE_TYPE)), custom) |
| 269 | # Do nothing. do your debouncing in matrix.c | 269 | # Do nothing. do your debouncing in matrix.c |
| 270 | else ifeq ($(strip $(DEBOUNCE_ALGO)), sym_g) | 270 | else ifeq ($(strip $(DEBOUNCE_TYPE)), sym_g) |
| 271 | QUANTUM_SRC += $(DEBOUNCE_DIR)/debounce_sym_g.c | 271 | QUANTUM_SRC += $(DEBOUNCE_DIR)/debounce_sym_g.c |
| 272 | else ifeq ($(strip $(DEBOUNCE_ALGO)), eager_pk) | 272 | else ifeq ($(strip $(DEBOUNCE_TYPE)), eager_pk) |
| 273 | QUANTUM_SRC += $(DEBOUNCE_DIR)/debounce_eager_pk.c | 273 | QUANTUM_SRC += $(DEBOUNCE_DIR)/debounce_eager_pk.c |
| 274 | else # default algorithm. Won't be used if we have a custom_matrix that doesn't utilize it | 274 | else # default algorithm. Won't be used if we have a custom_matrix that doesn't utilize it |
| 275 | QUANTUM_SRC += $(DEBOUNCE_DIR)/debounce_sym_g.c | 275 | QUANTUM_SRC += $(DEBOUNCE_DIR)/debounce_sym_g.c |