aboutsummaryrefslogtreecommitdiffstats
path: root/common_features.mk
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2020-01-27 22:31:54 +0000
committerGitHub <noreply@github.com>2020-01-27 22:31:54 +0000
commit9a0245b7784e11b34c5f44bcd2079af2e19ab654 (patch)
tree55a18b6bde771d51fe2dfa2b71d441eb9764172b /common_features.mk
parent43d2a0e167fe01b3bf7c793f421a238dc8109dc6 (diff)
downloadfirmware-9a0245b7784e11b34c5f44bcd2079af2e19ab654.tar.gz
firmware-9a0245b7784e11b34c5f44bcd2079af2e19ab654.tar.bz2
firmware-9a0245b7784e11b34c5f44bcd2079af2e19ab654.zip
Fix boards which were overriding backlight without setting custom (#7970)
Diffstat (limited to 'common_features.mk')
-rw-r--r--common_features.mk12
1 files changed, 7 insertions, 5 deletions
diff --git a/common_features.mk b/common_features.mk
index a431923bc..93c34c7d5 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -175,7 +175,9 @@ ifneq ($(strip $(LED_MATRIX_ENABLE)), no)
ifeq ($(filter $(LED_MATRIX_ENABLE),$(VALID_MATRIX_TYPES)),)
$(error LED_MATRIX_ENABLE="$(LED_MATRIX_ENABLE)" is not a valid matrix type)
else
- OPT_DEFS += -DLED_MATRIX_ENABLE -DBACKLIGHT_ENABLE -DBACKLIGHT_CUSTOM_DRIVER
+ BACKLIGHT_ENABLE = yes
+ BACKLIGHT_DRIVER = custom
+ OPT_DEFS += -DLED_MATRIX_ENABLE
SRC += $(QUANTUM_DIR)/led_matrix.c
SRC += $(QUANTUM_DIR)/led_matrix_drivers.c
endif
@@ -300,10 +302,6 @@ ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
$(error BACKLIGHT_DRIVER="$(BACKLIGHT_DRIVER)" is not a valid backlight type)
endif
- ifeq ($(strip $(VISUALIZER_ENABLE)), yes)
- CIE1931_CURVE := yes
- endif
-
COMMON_VPATH += $(QUANTUM_DIR)/backlight
SRC += $(QUANTUM_DIR)/backlight/backlight.c
OPT_DEFS += -DBACKLIGHT_ENABLE
@@ -343,6 +341,10 @@ ifeq ($(strip $(WS2812_DRIVER_REQUIRED)), yes)
endif
endif
+ifeq ($(strip $(VISUALIZER_ENABLE)), yes)
+ CIE1931_CURVE := yes
+endif
+
ifeq ($(strip $(CIE1931_CURVE)), yes)
OPT_DEFS += -DUSE_CIE1931_CURVE
LED_TABLES := yes