Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
c14abd8c14
44 changed files with 2164 additions and 185 deletions
|
|
@ -25,9 +25,11 @@ HELIX_ROWS = 5 # Helix Rows is 4 or 5
|
|||
# LED_ANIMATIONS = yes # LED animations
|
||||
# IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
|
||||
|
||||
CUSTOM_DELAY = yes
|
||||
|
||||
ifneq ($(strip $(HELIX)),)
|
||||
define KEYMAP_OPTION_PARSE
|
||||
# parse 'dispoff', 'consloe', 'na', 'ani', 'mini-ani'
|
||||
# parse 'dispoff', 'consloe', 'na', 'ani', 'mini-ani', 'scan-api',
|
||||
$(if $(SHOW_PARCE),$(info parse -$1-)) #debug
|
||||
ifeq ($(strip $1),dispoff)
|
||||
OLED_ENABLE = no
|
||||
|
|
@ -72,6 +74,11 @@ ifneq ($(strip $(HELIX)),)
|
|||
ifneq ($(filter nolto no-lto no_lto,$(strip $1)),)
|
||||
LTO_ENABLE = no
|
||||
endif
|
||||
ifeq ($(strip $1),scan-api)
|
||||
# use DEBUG_MATRIX_SCAN_RATE
|
||||
# see docs/newbs_testing_debugging.md
|
||||
DEBUG_MATRIX_SCAN_RATE_ENABLE = api
|
||||
endif
|
||||
endef # end of KEYMAP_OPTION_PARSE
|
||||
|
||||
COMMA=,
|
||||
|
|
@ -95,3 +102,7 @@ endif
|
|||
ifeq ($(strip $(OLED_ENABLE)), yes)
|
||||
SRC += oled_display.c
|
||||
endif
|
||||
|
||||
ifeq ($(strip $(CUSTOM_DELAY)),yes)
|
||||
SRC += matrix_output_unselect_delay.c
|
||||
endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue