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 qmk_firmware-320822d75b785401809f45007320e6fb6885b3fd.zip | |
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 | |||
| 82 | 82 | ||
| 83 | ifeq ($(strip $(UCIS_ENABLE)), yes) | 83 | ifeq ($(strip $(UCIS_ENABLE)), yes) |
| 84 | OPT_DEFS += -DUCIS_ENABLE | 84 | OPT_DEFS += -DUCIS_ENABLE |
| 85 | UNICODE_COMMON = yes | 85 | UNICODE_COMMON := yes |
| 86 | SRC += $(QUANTUM_DIR)/process_keycode/process_ucis.c | 86 | SRC += $(QUANTUM_DIR)/process_keycode/process_ucis.c |
| 87 | endif | 87 | endif |
| 88 | 88 | ||
| 89 | ifeq ($(strip $(UNICODEMAP_ENABLE)), yes) | 89 | ifeq ($(strip $(UNICODEMAP_ENABLE)), yes) |
| 90 | OPT_DEFS += -DUNICODEMAP_ENABLE | 90 | OPT_DEFS += -DUNICODEMAP_ENABLE |
| 91 | UNICODE_COMMON = yes | 91 | UNICODE_COMMON := yes |
| 92 | SRC += $(QUANTUM_DIR)/process_keycode/process_unicodemap.c | 92 | SRC += $(QUANTUM_DIR)/process_keycode/process_unicodemap.c |
| 93 | endif | 93 | endif |
| 94 | 94 | ||
| 95 | ifeq ($(strip $(UNICODE_ENABLE)), yes) | 95 | ifeq ($(strip $(UNICODE_ENABLE)), yes) |
| 96 | OPT_DEFS += -DUNICODE_ENABLE | 96 | OPT_DEFS += -DUNICODE_ENABLE |
| 97 | UNICODE_COMMON = yes | 97 | UNICODE_COMMON := yes |
| 98 | SRC += $(QUANTUM_DIR)/process_keycode/process_unicode.c | 98 | SRC += $(QUANTUM_DIR)/process_keycode/process_unicode.c |
| 99 | endif | 99 | endif |
| 100 | 100 | ||
| @@ -107,13 +107,13 @@ ifeq ($(strip $(RGBLIGHT_ENABLE)), yes) | |||
| 107 | OPT_DEFS += -DRGBLIGHT_ENABLE | 107 | OPT_DEFS += -DRGBLIGHT_ENABLE |
| 108 | SRC += $(QUANTUM_DIR)/color.c | 108 | SRC += $(QUANTUM_DIR)/color.c |
| 109 | SRC += $(QUANTUM_DIR)/rgblight.c | 109 | SRC += $(QUANTUM_DIR)/rgblight.c |
| 110 | CIE1931_CURVE = yes | 110 | CIE1931_CURVE := yes |
| 111 | LED_BREATHING_TABLE = yes | 111 | LED_BREATHING_TABLE := yes |
| 112 | RGB_KEYCODES_ENABLE = yes | 112 | RGB_KEYCODES_ENABLE := yes |
| 113 | ifeq ($(strip $(RGBLIGHT_CUSTOM_DRIVER)), yes) | 113 | ifeq ($(strip $(RGBLIGHT_CUSTOM_DRIVER)), yes) |
| 114 | OPT_DEFS += -DRGBLIGHT_CUSTOM_DRIVER | 114 | OPT_DEFS += -DRGBLIGHT_CUSTOM_DRIVER |
| 115 | else | 115 | else |
| 116 | WS2812_DRIVER_REQUIRED = yes | 116 | WS2812_DRIVER_REQUIRED := yes |
| 117 | endif | 117 | endif |
| 118 | endif | 118 | endif |
| 119 | 119 | ||
| @@ -147,12 +147,12 @@ endif | |||
| 147 | SRC += $(QUANTUM_DIR)/color.c | 147 | SRC += $(QUANTUM_DIR)/color.c |
| 148 | SRC += $(QUANTUM_DIR)/rgb_matrix.c | 148 | SRC += $(QUANTUM_DIR)/rgb_matrix.c |
| 149 | SRC += $(QUANTUM_DIR)/rgb_matrix_drivers.c | 149 | SRC += $(QUANTUM_DIR)/rgb_matrix_drivers.c |
| 150 | CIE1931_CURVE = yes | 150 | CIE1931_CURVE := yes |
| 151 | RGB_KEYCODES_ENABLE = yes | 151 | RGB_KEYCODES_ENABLE := yes |
| 152 | endif | 152 | endif |
| 153 | 153 | ||
| 154 | ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes) | 154 | ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes) |
| 155 | RGB_MATRIX_ENABLE = IS31FL3731 | 155 | RGB_MATRIX_ENABLE := IS31FL3731 |
| 156 | endif | 156 | endif |
| 157 | 157 | ||
| 158 | ifeq ($(strip $(RGB_MATRIX_ENABLE)), IS31FL3731) | 158 | ifeq ($(strip $(RGB_MATRIX_ENABLE)), IS31FL3731) |
| @@ -178,7 +178,7 @@ endif | |||
| 178 | 178 | ||
| 179 | ifeq ($(strip $(RGB_MATRIX_ENABLE)), WS2812) | 179 | ifeq ($(strip $(RGB_MATRIX_ENABLE)), WS2812) |
| 180 | OPT_DEFS += -DWS2812 | 180 | OPT_DEFS += -DWS2812 |
| 181 | WS2812_DRIVER_REQUIRED = yes | 181 | WS2812_DRIVER_REQUIRED := yes |
| 182 | endif | 182 | endif |
| 183 | 183 | ||
| 184 | ifeq ($(strip $(RGB_MATRIX_CUSTOM_KB)), yes) | 184 | ifeq ($(strip $(RGB_MATRIX_CUSTOM_KB)), yes) |
| @@ -232,12 +232,12 @@ endif | |||
| 232 | endif | 232 | endif |
| 233 | 233 | ||
| 234 | ifeq ($(strip $(LCD_ENABLE)), yes) | 234 | ifeq ($(strip $(LCD_ENABLE)), yes) |
| 235 | CIE1931_CURVE = yes | 235 | CIE1931_CURVE := yes |
| 236 | endif | 236 | endif |
| 237 | 237 | ||
| 238 | # backward compat | 238 | # backward compat |
| 239 | ifeq ($(strip $(BACKLIGHT_CUSTOM_DRIVER)), yes) | 239 | ifeq ($(strip $(BACKLIGHT_CUSTOM_DRIVER)), yes) |
| 240 | BACKLIGHT_DRIVER = custom | 240 | BACKLIGHT_DRIVER := custom |
| 241 | endif | 241 | endif |
| 242 | 242 | ||
| 243 | VALID_BACKLIGHT_TYPES := pwm software custom | 243 | VALID_BACKLIGHT_TYPES := pwm software custom |
| @@ -250,7 +250,7 @@ ifeq ($(strip $(BACKLIGHT_ENABLE)), yes) | |||
| 250 | endif | 250 | endif |
| 251 | 251 | ||
| 252 | ifeq ($(strip $(VISUALIZER_ENABLE)), yes) | 252 | ifeq ($(strip $(VISUALIZER_ENABLE)), yes) |
| 253 | CIE1931_CURVE = yes | 253 | CIE1931_CURVE := yes |
| 254 | endif | 254 | endif |
| 255 | 255 | ||
| 256 | COMMON_VPATH += $(QUANTUM_DIR)/backlight | 256 | COMMON_VPATH += $(QUANTUM_DIR)/backlight |
| @@ -294,12 +294,12 @@ endif | |||
| 294 | 294 | ||
| 295 | ifeq ($(strip $(CIE1931_CURVE)), yes) | 295 | ifeq ($(strip $(CIE1931_CURVE)), yes) |
| 296 | OPT_DEFS += -DUSE_CIE1931_CURVE | 296 | OPT_DEFS += -DUSE_CIE1931_CURVE |
| 297 | LED_TABLES = yes | 297 | LED_TABLES := yes |
| 298 | endif | 298 | endif |
| 299 | 299 | ||
| 300 | ifeq ($(strip $(LED_BREATHING_TABLE)), yes) | 300 | ifeq ($(strip $(LED_BREATHING_TABLE)), yes) |
| 301 | OPT_DEFS += -DUSE_LED_BREATHING_TABLE | 301 | OPT_DEFS += -DUSE_LED_BREATHING_TABLE |
| 302 | LED_TABLES = yes | 302 | LED_TABLES := yes |
| 303 | endif | 303 | endif |
| 304 | 304 | ||
| 305 | ifeq ($(strip $(LED_TABLES)), yes) | 305 | ifeq ($(strip $(LED_TABLES)), yes) |
| @@ -349,6 +349,14 @@ ifeq ($(strip $(VELOCIKEY_ENABLE)), yes) | |||
| 349 | SRC += $(QUANTUM_DIR)/velocikey.c | 349 | SRC += $(QUANTUM_DIR)/velocikey.c |
| 350 | endif | 350 | endif |
| 351 | 351 | ||
| 352 | ifeq ($(strip $(VIA_ENABLE)), yes) | ||
| 353 | DYNAMIC_KEYMAP_ENABLE := yes | ||
| 354 | RAW_ENABLE := yes | ||
| 355 | BOOTMAGIC_ENABLE := lite | ||
| 356 | SRC += $(QUANTUM_DIR)/via.c | ||
| 357 | OPT_DEFS += -DVIA_ENABLE | ||
| 358 | endif | ||
| 359 | |||
| 352 | ifeq ($(strip $(DYNAMIC_KEYMAP_ENABLE)), yes) | 360 | ifeq ($(strip $(DYNAMIC_KEYMAP_ENABLE)), yes) |
| 353 | OPT_DEFS += -DDYNAMIC_KEYMAP_ENABLE | 361 | OPT_DEFS += -DDYNAMIC_KEYMAP_ENABLE |
| 354 | SRC += $(QUANTUM_DIR)/dynamic_keymap.c | 362 | SRC += $(QUANTUM_DIR)/dynamic_keymap.c |
