diff options
| author | Takeshi ISHII <2170248+mtei@users.noreply.github.com> | 2022-04-22 06:33:08 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-21 14:33:08 -0700 |
| commit | 8f692e22e3ce176671bbdde51478ce0e6a57875b (patch) | |
| tree | 88f676a2390648c72a0032e21384e3a41cf0bd8e /keyboards/helix/rev2/local_features.mk | |
| parent | 969c68a9ad1474f578e69469807cf5e3405cd3ae (diff) | |
| download | qmk_firmware-8f692e22e3ce176671bbdde51478ce0e6a57875b.tar.gz qmk_firmware-8f692e22e3ce176671bbdde51478ce0e6a57875b.zip | |
Helix/rev2 move to split common (#16723)
Diffstat (limited to 'keyboards/helix/rev2/local_features.mk')
| -rw-r--r-- | keyboards/helix/rev2/local_features.mk | 53 |
1 files changed, 4 insertions, 49 deletions
diff --git a/keyboards/helix/rev2/local_features.mk b/keyboards/helix/rev2/local_features.mk index c6f818bf39..34fd699a65 100644 --- a/keyboards/helix/rev2/local_features.mk +++ b/keyboards/helix/rev2/local_features.mk @@ -40,24 +40,6 @@ ifneq ($(strip $(HELIX)),) SHOW_HELIX_OPTIONS = yes endif -ifneq ($(strip $(SPLIT_KEYBOARD)), yes) - # In the very near future, all keymaps will be compatible with split_common and this block will be removed. - SRC += local_drivers/serial.c - KEYBOARD_PATHS += $(HELIX_TOP_DIR)/local_drivers - - # A workaround until #7089 is merged. - # serial.c must not be compiled with the -lto option. - # The current LIB_SRC has a side effect with the -fno-lto option, so use it. - LIB_SRC += local_drivers/serial.c - - CUSTOM_MATRIX = yes - - SRC += rev2/custom/matrix.c - SRC += rev2/custom/split_util.c - SRC += rev2/custom/split_scomm.c - KEYBOARD_PATHS += $(HELIX_TOP_DIR)/rev2/custom -endif - ######## # convert Helix-specific options (that represent combinations of standard options) # into QMK standard options. @@ -88,44 +70,17 @@ ifeq ($(strip $(LED_ANIMATIONS)), yes) endif ifeq ($(strip $(OLED_ENABLE)), yes) - ifeq ($(strip $(OLED_SELECT)),core) - OLED_ENABLE = yes - OLED_DRIVER = SSD1306 - ifeq ($(strip $(LOCAL_GLCDFONT)), yes) - OPT_DEFS += -DOLED_FONT_H=\<helixfont.h\> - else - OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\" - endif + OLED_DRIVER = SSD1306 + ifeq ($(strip $(LOCAL_GLCDFONT)), yes) + OPT_DEFS += -DOLED_FONT_H=\<helixfont.h\> else - - # In the very near future, all keymaps will be compatible with QMK standard oled_driver and this block will be removed. - 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 - 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 + OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\" endif endif ifneq ($(strip $(SHOW_HELIX_OPTIONS)),) $(info Helix Spacific Build Options) $(info - OLED_ENABLE = $(OLED_ENABLE)) - $(info - OLED_SELECT = $(OLED_SELECT)) $(info - LED_BACK_ENABLE = $(LED_BACK_ENABLE)) $(info - LED_UNDERGLOW_ENABLE = $(LED_UNDERGLOW_ENABLE)) $(info - LED_ANIMATIONS = $(LED_ANIMATIONS)) |