Merge remote-tracking branch 'origin/master' into develop
commit
77a93fec79
|
@ -164,6 +164,16 @@ ifeq ($(strip $(OLED_ENABLE)), yes)
|
|||
OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\"
|
||||
endif
|
||||
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_LOCAL_ENABLE = yes
|
||||
SRC += local_drivers/i2c.c
|
||||
|
@ -175,6 +185,7 @@ ifeq ($(strip $(OLED_ENABLE)), yes)
|
|||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
ifneq ($(strip $(SHOW_HELIX_OPTIONS)),)
|
||||
$(eval $(call HELIX_CUSTOMISE_MSG))
|
||||
|
|
Loading…
Reference in New Issue