aboutsummaryrefslogtreecommitdiff
path: root/common_features.mk
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2019-12-16 20:27:53 +0000
committerDrashna Jaelre <drashna@live.com>2019-12-16 12:27:53 -0800
commitae40fc498b185d3d23908780a3d3425eb5ff05b5 (patch)
tree56d13173bdd6fae4faf4e88eb4c55a692c5878d2 /common_features.mk
parent0082ecf1f3328eb45a865bf50d3f44ca632d9f7b (diff)
downloadqmk_firmware-ae40fc498b185d3d23908780a3d3425eb5ff05b5.tar.gz
qmk_firmware-ae40fc498b185d3d23908780a3d3425eb5ff05b5.zip
Relocate RGB keycode processing (#7508)
* Move rgb keycode logic to process_keycode * Fixes for rgb matrix * Fixes for mxss * Fix inc/dec logic, add comments * Fix return RAINBOW_SWIRL logic * stop external use of rgb helper functions * merge fix * Fix 'defined but not used' when all animations are disabled
Diffstat (limited to 'common_features.mk')
-rw-r--r--common_features.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/common_features.mk b/common_features.mk
index 9b60eeed0..640539fd6 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -109,6 +109,7 @@ ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
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 ifeq ($(strip $(RGBLIGHT_CUSTOM_DRIVER)), yes) 113 ifeq ($(strip $(RGBLIGHT_CUSTOM_DRIVER)), yes)
113 OPT_DEFS += -DRGBLIGHT_CUSTOM_DRIVER 114 OPT_DEFS += -DRGBLIGHT_CUSTOM_DRIVER
114 else 115 else
@@ -147,6 +148,7 @@ endif
147 SRC += $(QUANTUM_DIR)/rgb_matrix.c 148 SRC += $(QUANTUM_DIR)/rgb_matrix.c
148 SRC += $(QUANTUM_DIR)/rgb_matrix_drivers.c 149 SRC += $(QUANTUM_DIR)/rgb_matrix_drivers.c
149 CIE1931_CURVE = yes 150 CIE1931_CURVE = yes
151 RGB_KEYCODES_ENABLE = yes
150endif 152endif
151 153
152ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes) 154ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
@@ -187,6 +189,10 @@ ifeq ($(strip $(RGB_MATRIX_CUSTOM_USER)), yes)
187 OPT_DEFS += -DRGB_MATRIX_CUSTOM_USER 189 OPT_DEFS += -DRGB_MATRIX_CUSTOM_USER
188endif 190endif
189 191
192ifeq ($(strip $(RGB_KEYCODES_ENABLE)), yes)
193 SRC += $(QUANTUM_DIR)/process_keycode/process_rgb.c
194endif
195
190ifeq ($(strip $(TAP_DANCE_ENABLE)), yes) 196ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
191 OPT_DEFS += -DTAP_DANCE_ENABLE 197 OPT_DEFS += -DTAP_DANCE_ENABLE
192 SRC += $(QUANTUM_DIR)/process_keycode/process_tap_dance.c 198 SRC += $(QUANTUM_DIR)/process_keycode/process_tap_dance.c