Let BACKLIGHT_ENABLE control the Infinity LEDs

8 years ago · a916f4e8b8
parent aaa67f6930
commit a916f4e8b8
6 changed files with 12 additions and 16 deletions
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@ -233,8 +233,10 @@ ifeq ($(strip $(LCD_ENABLE)), yes)
    CIE1931_CURVE = yes
 endif

-ifeq ($(strip $(LED_ENABLE)), yes)
-    CIE1931_CURVE = yes
+ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
+    ifeq ($(strip $(VISUALIZER_ENABLE)), yes)
+        CIE1931_CURVE = yes
+    endif
 endif

 ifeq ($(strip $(CIE1931_CURVE)), yes)
--- a/keyboards/ergodox/infinity/animations.c
+++ b/keyboards/ergodox/infinity/animations.c
@ -25,7 +25,7 @@
 #include "lcd_backlight_keyframes.h"
 #endif

-#ifdef LED_ENABLE
+#ifdef BACKLIGHT_ENABLE
 #include "led_keyframes.h"
 #endif

@ -61,7 +61,7 @@ keyframe_animation_t default_suspend_animation = {
 };
 #endif

-#if defined(LED_ENABLE)
+#if defined(BACKLIGHT_ENABLE)
 #define CROSSFADE_TIME 1000
 #define GRADIENT_TIME 3000

--- a/keyboards/ergodox/infinity/rules.mk
+++ b/keyboards/ergodox/infinity/rules.mk
@ -62,15 +62,10 @@ CUSTOM_MATRIX ?= yes # Custom matrix file
 SERIAL_LINK_ENABLE = yes
 VISUALIZER_ENABLE ?= yes
 LCD_ENABLE ?= yes
-LED_ENABLE ?= no
+BACKLIGHT_ENABLE ?= yes
 LCD_BACKLIGHT_ENABLE ?= yes
 MIDI_ENABLE = no
 RGBLIGHT_ENABLE = no

-ifdef LCD_ENABLE
 include $(SUBPROJECT_PATH)/drivers/gdisp/st7565ergodox/driver.mk
-endif
-
-ifdef LED_ENABLE
-include $(SUBPROJECT_PATH)/drivers/gdisp/IS31FL3731C/driver.mk
-endif
+include $(SUBPROJECT_PATH)/drivers/gdisp/IS31FL3731C/driver.mk
--- a/keyboards/ergodox/keymaps/333fred/Makefile
+++ b/keyboards/ergodox/keymaps/333fred/Makefile
@ -1,7 +1,7 @@
 SUBPROJECT_DEFAULT = infinity
 LCD_BACKLIGHT_ENABLE = yes
 LCD_ENABLE = yes
-LED_ENABLE = yes
+BACKLIGHT_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 NKRO_ENABLE = yes
 TAP_DANCE_ENABLE = yes
--- a/quantum/visualizer/visualizer.c
+++ b/quantum/visualizer/visualizer.c
@ -309,7 +309,7 @@ static DECLARE_THREAD_FUNCTION(visualizerThread, arg) {
                update_keyframe_animation(animations[i], &state, delta, &sleep_time);
            }
        }
-#ifdef LED_ENABLE
+#ifdef BACKLIGHT_ENABLE
        gdispGFlush(LED_DISPLAY);
 #endif

@ -372,7 +372,7 @@ void visualizer_init(void) {
 #ifdef LCD_ENABLE
    LCD_DISPLAY = get_lcd_display();
 #endif
-#ifdef LED_ENABLE
+#ifdef BACKLIGHT_ENABLE
    LED_DISPLAY = get_led_display();
 #endif

--- a/quantum/visualizer/visualizer.mk
+++ b/quantum/visualizer/visualizer.mk
@ -42,9 +42,8 @@ SRC += $(VISUALIZER_DIR)/resources/lcd_logo.c
 OPT_DEFS += -DLCD_BACKLIGHT_ENABLE
 endif

-ifeq ($(strip $(LED_ENABLE)), yes)
+ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
 SRC += $(VISUALIZER_DIR)/led_keyframes.c
-OPT_DEFS += -DLED_ENABLE
 endif

 include $(GFXLIB)/gfx.mk