fix: detect CONVERT_TO vs MCU in rules.mk
MCU no longer changes to match the converter, resulting in features being disabled unnecessarily on ARM Micros. Check for a non-blank CONVERT_TO instead.
This commit is contained in:
parent
efc1f6fba3
commit
7b8545b635
@ -2,7 +2,7 @@ VIA_ENABLE = yes
|
||||
VIAL_ENABLE = yes
|
||||
LTO_ENABLE = yes
|
||||
|
||||
ifeq ($(strip $(MCU)), atmega32u4)
|
||||
ifeq ($(strip $(CONVERT_TO)), )
|
||||
MAGIC_ENABLE = no
|
||||
SPACE_CADET_ENABLE = no
|
||||
COMBO_ENABLE = no
|
||||
|
@ -3,7 +3,7 @@ VIA_ENABLE = yes
|
||||
VIAL_ENABLE = yes
|
||||
LTO_ENABLE = yes
|
||||
|
||||
ifeq ($(strip $(MCU)), atmega32u4)
|
||||
ifeq ($(strip $(CONVERT_TO)), )
|
||||
MAGIC_ENABLE = no
|
||||
SPACE_CADET_ENABLE = no
|
||||
COMBO_ENABLE = no
|
||||
|
@ -3,7 +3,7 @@ VIAL_ENABLE = yes
|
||||
|
||||
VIALRGB_ENABLE = yes
|
||||
|
||||
ifeq ($(strip $(MCU)), atmega32u4)
|
||||
ifeq ($(strip $(CONVERT_TO)), )
|
||||
QMK_SETTINGS = no
|
||||
COMBO_ENABLE = no
|
||||
MOUSEKEY_ENABLE = no
|
||||
|
@ -8,6 +8,6 @@ EXTRAKEY_ENABLE = yes
|
||||
CONSOLE_ENABLE = no
|
||||
COMMAND_ENABLE = no
|
||||
|
||||
ifeq ($(strip $(MCU)), atmega32u4)
|
||||
ifeq ($(strip $(CONVERT_TO)), )
|
||||
QMK_SETTINGS = no
|
||||
endif
|
||||
|
@ -8,7 +8,7 @@ TAP_DANCE_ENABLE = yes
|
||||
GRAVE_ESC_ENABLE = yes
|
||||
SPACE_CADET_ENABLE = yes
|
||||
|
||||
ifeq ($(strip $(MCU)), atmega32u4)
|
||||
ifeq ($(strip $(CONVERT_TO)), )
|
||||
QMK_SETTINGS = no
|
||||
|
||||
KEY_OVERRIDE_ENABLE = no
|
||||
|
@ -3,7 +3,7 @@ VIAL_ENABLE = yes
|
||||
LTO_ENABLE = yes
|
||||
ENCODER_MAP_ENABLE = yes
|
||||
|
||||
ifeq ($(strip $(MCU)), atmega32u4)
|
||||
ifeq ($(strip $(CONVERT_TO)), )
|
||||
MAGIC_ENABLE = no
|
||||
SPACE_CADET_ENABLE = no
|
||||
#TAP_DANCE_ENABLE = no # if space becomes an issue, uncomment
|
||||
|
@ -4,7 +4,7 @@ VIAL_ENABLE = yes
|
||||
|
||||
ENCODER_MAP_ENABLE = yes
|
||||
|
||||
ifeq ($(strip $(MCU)), atmega32u4)
|
||||
ifeq ($(strip $(CONVERT_TO)), )
|
||||
QMK_SETTINGS = no
|
||||
|
||||
MAGIC_ENABLE = no
|
||||
|
@ -4,7 +4,7 @@ VIAL_ENABLE = yes
|
||||
|
||||
ENCODER_MAP_ENABLE = yes
|
||||
|
||||
ifeq ($(strip $(MCU)), atmega32u4)
|
||||
ifeq ($(strip $(CONVERT_TO)), )
|
||||
QMK_SETTINGS = no
|
||||
|
||||
MAGIC_ENABLE = no
|
||||
|
@ -5,7 +5,7 @@ ENCODER_MAP_ENABLE = yes
|
||||
MOUSEKEY_ENABLE = yes
|
||||
COMBOS_ENABLE = yes
|
||||
|
||||
ifeq ($(strip $(MCU)), atmega32u4)
|
||||
ifeq ($(strip $(CONVERT_TO)),)
|
||||
QMK_SETTINGS = no
|
||||
TAP_DANCE_ENABLE = no
|
||||
KEY_OVERRIDE_ENABLE = no
|
||||
|
@ -2,7 +2,7 @@ ENCODER_MAP_ENABLE = yes
|
||||
VIA_ENABLE = yes
|
||||
VIAL_ENABLE = yes
|
||||
|
||||
ifeq ($(strip $(MCU)), atmega32u4)
|
||||
ifeq ($(strip $(CONVERT_TO)), )
|
||||
GRAVE_ESC_ENABLE = no
|
||||
KEY_OVERRIDE_ENABLE = no
|
||||
LTO_ENABLE = yes
|
||||
|
@ -5,7 +5,7 @@ VIA_ENABLE = yes
|
||||
VIAL_ENABLE = yes
|
||||
|
||||
# Saving space on atmega32u4
|
||||
ifeq ($(strip $(MCU)), atmega32u4)
|
||||
ifeq ($(strip $(CONVERT_TO)), )
|
||||
OLED_ENABLE = no
|
||||
MOUSEKEY_ENABLE = no
|
||||
COMBO_ENABLE = no
|
||||
|
@ -7,7 +7,7 @@ VIAL_ENABLE = yes
|
||||
ENCODER_MAP_ENABLE = yes
|
||||
|
||||
# Reduce size on atmega32u4
|
||||
ifeq ($(strip $(MCU)), atmega32u4)
|
||||
ifeq ($(strip $(CONVERT_TO)), )
|
||||
TAP_DANCE_ENABLE = no
|
||||
QMK_SETTINGS = no
|
||||
KEY_OVERRIDE_ENABLE = no
|
||||
|
Loading…
Reference in New Issue
Block a user