andrejl
/
qmk-dactyl-manuform-a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

master
QMK Bot 2021-08-29 06:06:26 +00:00
parent c729df09ca 9afc64cd61
commit 77a93fec79
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
keyboards/helix/rev2/local_features.mk
View File

@ -164,6 +164,16 @@ ifeq ($(strip $(OLED_ENABLE)), yes)
OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\" OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\"
endif endif
else else
ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
$(info Helix/rev2: The following combinations are not supported.)
$(info - SPLIT_KEYBOARD = $(SPLIT_KEYBOARD)) # yes
$(info - OLED_ENABLE = $(OLED_ENABLE)) # yes
$(info - OLED_SELECT = $(OLED_SELECT)) # local
$(info Force : OLED_ENABLE = no)
$(info .)
OLED_ENABLE = no
endif
ifeq ($(strip $(OLED_ENABLE)), yes)
OLED_ENABLE = no # disable OLED in TOP/common_features.mk OLED_ENABLE = no # disable OLED in TOP/common_features.mk
OLED_LOCAL_ENABLE = yes OLED_LOCAL_ENABLE = yes
SRC += local_drivers/i2c.c SRC += local_drivers/i2c.c
@ -174,6 +184,7 @@ ifeq ($(strip $(OLED_ENABLE)), yes)
OPT_DEFS += -DLOCAL_GLCDFONT OPT_DEFS += -DLOCAL_GLCDFONT
endif endif
endif endif
endif
endif endif
ifneq ($(strip $(SHOW_HELIX_OPTIONS)),) ifneq ($(strip $(SHOW_HELIX_OPTIONS)),)