diff options
Diffstat (limited to 'keyboards/helix/rev2/local_features.mk')
-rw-r--r-- | keyboards/helix/rev2/local_features.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/keyboards/helix/rev2/local_features.mk b/keyboards/helix/rev2/local_features.mk index ce3853a02..47e8c6a83 100644 --- a/keyboards/helix/rev2/local_features.mk +++ b/keyboards/helix/rev2/local_features.mk | |||
@@ -156,17 +156,20 @@ endif | |||
156 | 156 | ||
157 | ifeq ($(strip $(OLED_ENABLE)), yes) | 157 | ifeq ($(strip $(OLED_ENABLE)), yes) |
158 | ifeq ($(strip $(OLED_SELECT)),core) | 158 | ifeq ($(strip $(OLED_SELECT)),core) |
159 | OLED_DRIVER_ENABLE = yes | 159 | OLED_ENABLE = yes |
160 | OLED_DRIVER = SSD1306 | ||
160 | ifeq ($(strip $(LOCAL_GLCDFONT)), yes) | 161 | ifeq ($(strip $(LOCAL_GLCDFONT)), yes) |
161 | OPT_DEFS += -DOLED_FONT_H=\<helixfont.h\> | 162 | OPT_DEFS += -DOLED_FONT_H=\<helixfont.h\> |
162 | else | 163 | else |
163 | OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\" | 164 | OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\" |
164 | endif | 165 | endif |
165 | else | 166 | else |
167 | OLED_ENABLE = no # disable OLED in TOP/common_features.mk | ||
168 | OLED_LOCAL_ENABLE = yes | ||
166 | SRC += local_drivers/i2c.c | 169 | SRC += local_drivers/i2c.c |
167 | SRC += local_drivers/ssd1306.c | 170 | SRC += local_drivers/ssd1306.c |
168 | KEYBOARD_PATHS += $(HELIX_TOP_DIR)/local_drivers | 171 | KEYBOARD_PATHS += $(HELIX_TOP_DIR)/local_drivers |
169 | OPT_DEFS += -DOLED_ENABLE | 172 | OPT_DEFS += -DOLED_LOCAL_ENABLE |
170 | ifeq ($(strip $(LOCAL_GLCDFONT)), yes) | 173 | ifeq ($(strip $(LOCAL_GLCDFONT)), yes) |
171 | OPT_DEFS += -DLOCAL_GLCDFONT | 174 | OPT_DEFS += -DLOCAL_GLCDFONT |
172 | endif | 175 | endif |
@@ -177,7 +180,8 @@ ifneq ($(strip $(SHOW_HELIX_OPTIONS)),) | |||
177 | $(eval $(call HELIX_CUSTOMISE_MSG)) | 180 | $(eval $(call HELIX_CUSTOMISE_MSG)) |
178 | ifneq ($(strip $(SHOW_VERBOSE_INFO)),) | 181 | ifneq ($(strip $(SHOW_VERBOSE_INFO)),) |
179 | $(info -- RGBLIGHT_ENABLE = $(RGBLIGHT_ENABLE)) | 182 | $(info -- RGBLIGHT_ENABLE = $(RGBLIGHT_ENABLE)) |
180 | $(info -- OLED_DRIVER_ENABLE = $(OLED_DRIVER_ENABLE)) | 183 | $(info -- OLED_DRIVER = $(OLED_DRIVER)) |
184 | $(info -- OLED_LOCAL_ENABLE = $(OLED_LOCAL_ENABLE)) | ||
181 | $(info -- CONSOLE_ENABLE = $(CONSOLE_ENABLE)) | 185 | $(info -- CONSOLE_ENABLE = $(CONSOLE_ENABLE)) |
182 | $(info -- OPT_DEFS = $(OPT_DEFS)) | 186 | $(info -- OPT_DEFS = $(OPT_DEFS)) |
183 | $(info -- SPLIT_KEYBOARD = $(SPLIT_KEYBOARD)) | 187 | $(info -- SPLIT_KEYBOARD = $(SPLIT_KEYBOARD)) |