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

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

@ -164,14 +164,25 @@ 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
OLED_ENABLE = no # disable OLED in TOP/common_features.mk ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
OLED_LOCAL_ENABLE = yes $(info Helix/rev2: The following combinations are not supported.)
SRC += local_drivers/i2c.c $(info - SPLIT_KEYBOARD = $(SPLIT_KEYBOARD)) # yes
SRC += local_drivers/ssd1306.c $(info - OLED_ENABLE = $(OLED_ENABLE)) # yes
KEYBOARD_PATHS += $(HELIX_TOP_DIR)/local_drivers $(info - OLED_SELECT = $(OLED_SELECT)) # local
OPT_DEFS += -DOLED_LOCAL_ENABLE $(info Force : OLED_ENABLE = no)
ifeq ($(strip $(LOCAL_GLCDFONT)), yes) $(info .)
OPT_DEFS += -DLOCAL_GLCDFONT OLED_ENABLE = no
endif
ifeq ($(strip $(OLED_ENABLE)), yes)
OLED_ENABLE = no # disable OLED in TOP/common_features.mk
OLED_LOCAL_ENABLE = yes
SRC += local_drivers/i2c.c
SRC += local_drivers/ssd1306.c
KEYBOARD_PATHS += $(HELIX_TOP_DIR)/local_drivers
OPT_DEFS += -DOLED_LOCAL_ENABLE
ifeq ($(strip $(LOCAL_GLCDFONT)), yes)
OPT_DEFS += -DLOCAL_GLCDFONT
endif
endif endif
endif endif
endif endif