diff options
| author | Nick Brassel <nick@tzarc.org> | 2021-01-28 10:52:59 +1100 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2021-01-28 10:52:59 +1100 |
| commit | d65db68f9f2614b91e3cb565086166b01400e473 (patch) | |
| tree | 7477dbd7666a170444ffbf2ad29aa6d25189bf50 /common_features.mk | |
| parent | 99f3df28939d89b7fc2d2e7c0ee21b0879c7813f (diff) | |
| parent | bad9592a18494e3f678c2a117a526ca5f2f2280d (diff) | |
| download | qmk_firmware-d65db68f9f2614b91e3cb565086166b01400e473.tar.gz qmk_firmware-d65db68f9f2614b91e3cb565086166b01400e473.zip | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'common_features.mk')
| -rw-r--r-- | common_features.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/common_features.mk b/common_features.mk index 95b59937c..fa92a8482 100644 --- a/common_features.mk +++ b/common_features.mk | |||
| @@ -24,6 +24,8 @@ QUANTUM_SRC += \ | |||
| 24 | ifeq ($(strip $(DEBUG_MATRIX_SCAN_RATE_ENABLE)), yes) | 24 | ifeq ($(strip $(DEBUG_MATRIX_SCAN_RATE_ENABLE)), yes) |
| 25 | OPT_DEFS += -DDEBUG_MATRIX_SCAN_RATE | 25 | OPT_DEFS += -DDEBUG_MATRIX_SCAN_RATE |
| 26 | CONSOLE_ENABLE = yes | 26 | CONSOLE_ENABLE = yes |
| 27 | else ifeq ($(strip $(DEBUG_MATRIX_SCAN_RATE_ENABLE)), api) | ||
| 28 | OPT_DEFS += -DDEBUG_MATRIX_SCAN_RATE | ||
| 27 | endif | 29 | endif |
| 28 | 30 | ||
| 29 | ifeq ($(strip $(API_SYSEX_ENABLE)), yes) | 31 | ifeq ($(strip $(API_SYSEX_ENABLE)), yes) |