diff options
author | Wilba <Jason.S.Williams@gmail.com> | 2020-01-04 07:52:00 +1100 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2020-01-03 12:52:00 -0800 |
commit | 320822d75b785401809f45007320e6fb6885b3fd (patch) | |
tree | c511d49a48b953ac29ffb4a51ac928319eb9fde4 /common_features.mk | |
parent | b36259566546eb884cc241bcfadb671051e5e75e (diff) | |
download | qmk_firmware-320822d75b785401809f45007320e6fb6885b3fd.tar.gz |
VIA Configurator Refactor (#7268)
* VIA Refactor
* Remove old code
* review changes
* review changes
* Fix cannonkeys/satisfaction75/prototype:via build
* Add via.h to quantum.h
* Move backlight init to after backlight config load
* Merge branch 'master' into via_refactor_pr
* Update user's rules.mk to new way of enabling VIA
* Added id_switch_matrix_state
* Review changes
Diffstat (limited to 'common_features.mk')
-rw-r--r-- | common_features.mk | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/common_features.mk b/common_features.mk index 640539fd6..92b24bb20 100644 --- a/common_features.mk +++ b/common_features.mk @@ -82,19 +82,19 @@ endif ifeq ($(strip $(UCIS_ENABLE)), yes) OPT_DEFS += -DUCIS_ENABLE - UNICODE_COMMON = yes + UNICODE_COMMON := yes SRC += $(QUANTUM_DIR)/process_keycode/process_ucis.c endif ifeq ($(strip $(UNICODEMAP_ENABLE)), yes) OPT_DEFS += -DUNICODEMAP_ENABLE - UNICODE_COMMON = yes + UNICODE_COMMON := yes SRC += $(QUANTUM_DIR)/process_keycode/process_unicodemap.c endif ifeq ($(strip $(UNICODE_ENABLE)), yes) OPT_DEFS += -DUNICODE_ENABLE - UNICODE_COMMON = yes + UNICODE_COMMON := yes SRC += $(QUANTUM_DIR)/process_keycode/process_unicode.c endif @@ -107,13 +107,13 @@ ifeq ($(strip $(RGBLIGHT_ENABLE)), yes) OPT_DEFS += -DRGBLIGHT_ENABLE SRC += $(QUANTUM_DIR)/color.c SRC += $(QUANTUM_DIR)/rgblight.c - CIE1931_CURVE = yes - LED_BREATHING_TABLE = yes - RGB_KEYCODES_ENABLE = yes + CIE1931_CURVE := yes + LED_BREATHING_TABLE := yes + RGB_KEYCODES_ENABLE := yes ifeq ($(strip $(RGBLIGHT_CUSTOM_DRIVER)), yes) OPT_DEFS += -DRGBLIGHT_CUSTOM_DRIVER else - WS2812_DRIVER_REQUIRED = yes + WS2812_DRIVER_REQUIRED := yes endif endif @@ -147,12 +147,12 @@ endif SRC += $(QUANTUM_DIR)/color.c SRC += $(QUANTUM_DIR)/rgb_matrix.c SRC += $(QUANTUM_DIR)/rgb_matrix_drivers.c - CIE1931_CURVE = yes - RGB_KEYCODES_ENABLE = yes + CIE1931_CURVE := yes + RGB_KEYCODES_ENABLE := yes endif ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes) - RGB_MATRIX_ENABLE = IS31FL3731 + RGB_MATRIX_ENABLE := IS31FL3731 endif ifeq ($(strip $(RGB_MATRIX_ENABLE)), IS31FL3731) @@ -178,7 +178,7 @@ endif ifeq ($(strip $(RGB_MATRIX_ENABLE)), WS2812) OPT_DEFS += -DWS2812 - WS2812_DRIVER_REQUIRED = yes + WS2812_DRIVER_REQUIRED := yes endif ifeq ($(strip $(RGB_MATRIX_CUSTOM_KB)), yes) @@ -232,12 +232,12 @@ endif endif ifeq ($(strip $(LCD_ENABLE)), yes) - CIE1931_CURVE = yes + CIE1931_CURVE := yes endif # backward compat ifeq ($(strip $(BACKLIGHT_CUSTOM_DRIVER)), yes) - BACKLIGHT_DRIVER = custom + BACKLIGHT_DRIVER := custom endif VALID_BACKLIGHT_TYPES := pwm software custom @@ -250,7 +250,7 @@ ifeq ($(strip $(BACKLIGHT_ENABLE)), yes) endif ifeq ($(strip $(VISUALIZER_ENABLE)), yes) - CIE1931_CURVE = yes + CIE1931_CURVE := yes endif COMMON_VPATH += $(QUANTUM_DIR)/backlight @@ -294,12 +294,12 @@ endif ifeq ($(strip $(CIE1931_CURVE)), yes) OPT_DEFS += -DUSE_CIE1931_CURVE - LED_TABLES = yes + LED_TABLES := yes endif ifeq ($(strip $(LED_BREATHING_TABLE)), yes) OPT_DEFS += -DUSE_LED_BREATHING_TABLE - LED_TABLES = yes + LED_TABLES := yes endif ifeq ($(strip $(LED_TABLES)), yes) @@ -349,6 +349,14 @@ ifeq ($(strip $(VELOCIKEY_ENABLE)), yes) SRC += $(QUANTUM_DIR)/velocikey.c endif +ifeq ($(strip $(VIA_ENABLE)), yes) + DYNAMIC_KEYMAP_ENABLE := yes + RAW_ENABLE := yes + BOOTMAGIC_ENABLE := lite + SRC += $(QUANTUM_DIR)/via.c + OPT_DEFS += -DVIA_ENABLE +endif + ifeq ($(strip $(DYNAMIC_KEYMAP_ENABLE)), yes) OPT_DEFS += -DDYNAMIC_KEYMAP_ENABLE SRC += $(QUANTUM_DIR)/dynamic_keymap.c |