Merge remote-tracking branch 'upstream/master' into develop

This commit is contained in:
Nick Brassel committed 2021-01-28 10:52:59 +11:00
commit d65db68f9f
7 files changed
+30 -2

No files matched your search

+2
View File
@@ -24,6 +24,8 @@ QUANTUM_SRC += \
ifeq ($(strip $(DEBUG_MATRIX_SCAN_RATE_ENABLE)), yes)
OPT_DEFS += -DDEBUG_MATRIX_SCAN_RATE
CONSOLE_ENABLE = yes
else ifeq ($(strip $(DEBUG_MATRIX_SCAN_RATE_ENABLE)), api)
OPT_DEFS += -DDEBUG_MATRIX_SCAN_RATE
endif
ifeq ($(strip $(API_SYSEX_ENABLE)), yes)