summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2017-06-03 14:34:50 +0300
committerFred Sundvik <fsundvik@gmail.com>2017-06-03 14:34:50 +0300
commita916f4e8b897b6b8925d7113d84f9eac7e7b67be (patch)
tree19131f31ecd9ccb8fb5672caf1b5ef652f4f88f1 /keyboards/ergodox
parentaaa67f69305c5c78e15a1090ba7058adea59ff36 (diff)
Let BACKLIGHT_ENABLE control the Infinity LEDs
Diffstat (limited to 'keyboards/ergodox')
-rw-r--r--keyboards/ergodox/infinity/animations.c4
-rw-r--r--keyboards/ergodox/infinity/rules.mk9
-rw-r--r--keyboards/ergodox/keymaps/333fred/Makefile2
3 files changed, 5 insertions, 10 deletions
diff --git a/keyboards/ergodox/infinity/animations.c b/keyboards/ergodox/infinity/animations.c
index 4c9f6d9c85..0e732b7411 100644
--- 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
diff --git a/keyboards/ergodox/infinity/rules.mk b/keyboards/ergodox/infinity/rules.mk
index 9e6170d89a..af29ebce8d 100644
--- 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 \ No newline at end of file
+include $(SUBPROJECT_PATH)/drivers/gdisp/IS31FL3731C/driver.mk \ No newline at end of file
diff --git a/keyboards/ergodox/keymaps/333fred/Makefile b/keyboards/ergodox/keymaps/333fred/Makefile
index 87985bda19..b977722a2f 100644
--- 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