Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Fix boards which were overriding backlight without setting custom (#7970)

Browse source
This commit is contained in:
Joel Challis 2020-01-27 22:31:54 +00:00 committed by GitHub
parent 43d2a0e167
commit 9a0245b778
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common_features.mk
View file

@ -175,7 +175,9 @@ ifneq ($(strip $(LED_MATRIX_ENABLE)), no)
ifeq ($(filter $(LED_MATRIX_ENABLE),$(VALID_MATRIX_TYPES)),) ifeq ($(filter $(LED_MATRIX_ENABLE),$(VALID_MATRIX_TYPES)),)
$(error LED_MATRIX_ENABLE="$(LED_MATRIX_ENABLE)" is not a valid matrix type) $(error LED_MATRIX_ENABLE="$(LED_MATRIX_ENABLE)" is not a valid matrix type)
else 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.c
SRC += $(QUANTUM_DIR)/led_matrix_drivers.c SRC += $(QUANTUM_DIR)/led_matrix_drivers.c
endif endif
@ -300,10 +302,6 @@ ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
$(error BACKLIGHT_DRIVER="$(BACKLIGHT_DRIVER)" is not a valid backlight type) $(error BACKLIGHT_DRIVER="$(BACKLIGHT_DRIVER)" is not a valid backlight type)
endif endif
ifeq ($(strip $(VISUALIZER_ENABLE)), yes)
CIE1931_CURVE := yes
endif
COMMON_VPATH += $(QUANTUM_DIR)/backlight COMMON_VPATH += $(QUANTUM_DIR)/backlight
SRC += $(QUANTUM_DIR)/backlight/backlight.c SRC += $(QUANTUM_DIR)/backlight/backlight.c
OPT_DEFS += -DBACKLIGHT_ENABLE OPT_DEFS += -DBACKLIGHT_ENABLE
@ -343,6 +341,10 @@ ifeq ($(strip $(WS2812_DRIVER_REQUIRED)), yes)
endif endif
endif endif
ifeq ($(strip $(VISUALIZER_ENABLE)), yes)
CIE1931_CURVE := yes
endif
ifeq ($(strip $(CIE1931_CURVE)), yes) ifeq ($(strip $(CIE1931_CURVE)), yes)
OPT_DEFS += -DUSE_CIE1931_CURVE OPT_DEFS += -DUSE_CIE1931_CURVE
LED_TABLES := yes LED_TABLES := yes

1
keyboards/cannonkeys/ortho48/rules.mk
View file

@ -22,6 +22,7 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
NKRO_ENABLE = yes # USB Nkey Rollover NKRO_ENABLE = yes # USB Nkey Rollover
BACKLIGHT_ENABLE = yes BACKLIGHT_ENABLE = yes
BACKLIGHT_DRIVER = custom
RGBLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes
LAYOUTS = ortho_4x12 LAYOUTS = ortho_4x12

1
keyboards/cannonkeys/ortho60/rules.mk
View file

@ -22,6 +22,7 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
NKRO_ENABLE = yes # USB Nkey Rollover NKRO_ENABLE = yes # USB Nkey Rollover
BACKLIGHT_ENABLE = yes BACKLIGHT_ENABLE = yes
BACKLIGHT_DRIVER = custom
RGBLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes
LAYOUTS = ortho_5x12 LAYOUTS = ortho_5x12

1
keyboards/cannonkeys/ortho75/rules.mk
View file

@ -22,6 +22,7 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
NKRO_ENABLE = yes # USB Nkey Rollover NKRO_ENABLE = yes # USB Nkey Rollover
BACKLIGHT_ENABLE = yes BACKLIGHT_ENABLE = yes
BACKLIGHT_DRIVER = custom
RGBLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes
ENCODER_ENABLE = yes ENCODER_ENABLE = yes

1
keyboards/cannonkeys/practice60/rules.mk
View file

@ -22,6 +22,7 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
NKRO_ENABLE = yes # USB Nkey Rollover NKRO_ENABLE = yes # USB Nkey Rollover
BACKLIGHT_ENABLE = yes BACKLIGHT_ENABLE = yes
BACKLIGHT_DRIVER = custom
RGBLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes
LAYOUTS = 60_ansi LAYOUTS = 60_ansi

1
keyboards/cannonkeys/practice65/rules.mk
View file

@ -22,4 +22,5 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
NKRO_ENABLE = yes # USB Nkey Rollover NKRO_ENABLE = yes # USB Nkey Rollover
BACKLIGHT_ENABLE = yes BACKLIGHT_ENABLE = yes
BACKLIGHT_DRIVER = custom
RGBLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes

1
keyboards/clueboard/66_hotswap/gen1/led.c
View file

@ -16,6 +16,5 @@
*/ */
#include "hal.h" #include "hal.h"
#include "backlight.h"
#include "led.h" #include "led.h"
#include "printf.h" #include "printf.h"

1
keyboards/clueboard/66_hotswap/gen1/matrix.c
View file

@ -5,7 +5,6 @@
#include "timer.h" #include "timer.h"
#include "wait.h" #include "wait.h"
#include "printf.h" #include "printf.h"
#include "backlight.h"
#include "matrix.h" #include "matrix.h"
#include "action.h" #include "action.h"
#include "keycode.h" #include "keycode.h"

1
keyboards/clueboard/66_hotswap/gen1/rules.mk
View file

@ -7,7 +7,6 @@ LED_MATRIX_ENABLE = IS31FL3731
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #
BACKLIGHT_ENABLE = yes
BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.) ## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
MOUSEKEY_ENABLE = yes # Mouse keys MOUSEKEY_ENABLE = yes # Mouse keys

1
keyboards/ergodox_infinity/rules.mk
View file

@ -79,6 +79,7 @@ SERIAL_LINK_ENABLE = yes
VISUALIZER_ENABLE = yes VISUALIZER_ENABLE = yes
LCD_ENABLE = yes LCD_ENABLE = yes
BACKLIGHT_ENABLE = yes BACKLIGHT_ENABLE = yes
BACKLIGHT_DRIVER = custom
LCD_BACKLIGHT_ENABLE = yes LCD_BACKLIGHT_ENABLE = yes
MIDI_ENABLE = no MIDI_ENABLE = no
RGBLIGHT_ENABLE = no RGBLIGHT_ENABLE = no

1
keyboards/whitefox/rules.mk
View file

@ -72,6 +72,7 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = yes # USB Nkey Rollover NKRO_ENABLE = yes # USB Nkey Rollover
CUSTOM_MATRIX = yes # Custom matrix file CUSTOM_MATRIX = yes # Custom matrix file
BACKLIGHT_ENABLE = yes BACKLIGHT_ENABLE = yes
BACKLIGHT_DRIVER = custom
VISUALIZER_ENABLE = yes VISUALIZER_ENABLE = yes
LED_DRIVER = is31fl3731c LED_DRIVER = is31fl3731c