~ruther/qmk_firmware

9a0245b7784e11b34c5f44bcd2079af2e19ab654 — Joel Challis 5 years ago 43d2a0e
Fix boards which were overriding backlight without setting custom (#7970)

M common_features.mk => common_features.mk +7 -5
@@ 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

M keyboards/cannonkeys/ortho48/rules.mk => keyboards/cannonkeys/ortho48/rules.mk +1 -0
@@ 22,6 22,7 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
NKRO_ENABLE = yes	    # USB Nkey Rollover
BACKLIGHT_ENABLE = yes
BACKLIGHT_DRIVER = custom
RGBLIGHT_ENABLE = yes

LAYOUTS = ortho_4x12

M keyboards/cannonkeys/ortho60/rules.mk => keyboards/cannonkeys/ortho60/rules.mk +1 -0
@@ 22,6 22,7 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
NKRO_ENABLE = yes	    # USB Nkey Rollover
BACKLIGHT_ENABLE = yes
BACKLIGHT_DRIVER = custom
RGBLIGHT_ENABLE = yes

LAYOUTS = ortho_5x12

M keyboards/cannonkeys/ortho75/rules.mk => keyboards/cannonkeys/ortho75/rules.mk +1 -0
@@ 22,6 22,7 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
NKRO_ENABLE = yes	    # USB Nkey Rollover
BACKLIGHT_ENABLE = yes
BACKLIGHT_DRIVER = custom
RGBLIGHT_ENABLE = yes
ENCODER_ENABLE = yes


M keyboards/cannonkeys/practice60/rules.mk => keyboards/cannonkeys/practice60/rules.mk +1 -0
@@ 22,6 22,7 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
NKRO_ENABLE = yes	    # USB Nkey Rollover
BACKLIGHT_ENABLE = yes
BACKLIGHT_DRIVER = custom
RGBLIGHT_ENABLE = yes

LAYOUTS = 60_ansi

M keyboards/cannonkeys/practice65/rules.mk => keyboards/cannonkeys/practice65/rules.mk +1 -0
@@ 22,4 22,5 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
NKRO_ENABLE = yes	    # USB Nkey Rollover
BACKLIGHT_ENABLE = yes
BACKLIGHT_DRIVER = custom
RGBLIGHT_ENABLE = yes

M keyboards/clueboard/66_hotswap/gen1/led.c => keyboards/clueboard/66_hotswap/gen1/led.c +0 -1
@@ 16,6 16,5 @@
*/

#include "hal.h"
#include "backlight.h"
#include "led.h"
#include "printf.h"

M keyboards/clueboard/66_hotswap/gen1/matrix.c => keyboards/clueboard/66_hotswap/gen1/matrix.c +0 -1
@@ 5,7 5,6 @@
#include "timer.h"
#include "wait.h"
#include "printf.h"
#include "backlight.h"
#include "matrix.h"
#include "action.h"
#include "keycode.h"

M keyboards/clueboard/66_hotswap/gen1/rules.mk => keyboards/clueboard/66_hotswap/gen1/rules.mk +0 -1
@@ 7,7 7,6 @@ LED_MATRIX_ENABLE = IS31FL3731
# Build Options
#   comment out to disable the options.
#
BACKLIGHT_ENABLE = yes
BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration
## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
MOUSEKEY_ENABLE = yes	# Mouse keys

M keyboards/ergodox_infinity/rules.mk => keyboards/ergodox_infinity/rules.mk +1 -0
@@ 79,6 79,7 @@ SERIAL_LINK_ENABLE = yes
VISUALIZER_ENABLE = yes
LCD_ENABLE = yes
BACKLIGHT_ENABLE = yes
BACKLIGHT_DRIVER = custom
LCD_BACKLIGHT_ENABLE = yes
MIDI_ENABLE = no
RGBLIGHT_ENABLE = no

M keyboards/whitefox/rules.mk => keyboards/whitefox/rules.mk +1 -0
@@ 72,6 72,7 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
NKRO_ENABLE = yes	    # USB Nkey Rollover
CUSTOM_MATRIX = yes # Custom matrix file
BACKLIGHT_ENABLE = yes
BACKLIGHT_DRIVER = custom
VISUALIZER_ENABLE = yes

LED_DRIVER = is31fl3731c