localhots/qmk_firmware
1
0
Fork 0
Code Releases Activity

Let BACKLIGHT_ENABLE control the Infinity LEDs

Browse Source
This commit is contained in:
Fred Sundvik 2017-06-03 14:34:50 +03:00
parent aaa67f6930
commit a916f4e8b8
6 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_keyboard.mk
View File

@ -233,8 +233,10 @@ ifeq ($(strip $(LCD_ENABLE)), yes)
CIE1931_CURVE = yes CIE1931_CURVE = yes
endif endif
ifeq ($(strip $(LED_ENABLE)), yes) ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
CIE1931_CURVE = yes ifeq ($(strip $(VISUALIZER_ENABLE)), yes)
CIE1931_CURVE = yes
endif
endif endif
ifeq ($(strip $(CIE1931_CURVE)), yes) ifeq ($(strip $(CIE1931_CURVE)), yes)

4
keyboards/ergodox/infinity/animations.c
View File

@ -25,7 +25,7 @@
#include "lcd_backlight_keyframes.h" #include "lcd_backlight_keyframes.h"
#endif #endif
#ifdef LED_ENABLE #ifdef BACKLIGHT_ENABLE
#include "led_keyframes.h" #include "led_keyframes.h"
#endif #endif
@ -61,7 +61,7 @@ keyframe_animation_t default_suspend_animation = {
}; };
#endif #endif
#if defined(LED_ENABLE) #if defined(BACKLIGHT_ENABLE)
#define CROSSFADE_TIME 1000 #define CROSSFADE_TIME 1000
#define GRADIENT_TIME 3000 #define GRADIENT_TIME 3000

9
keyboards/ergodox/infinity/rules.mk
View File

@ -62,15 +62,10 @@ CUSTOM_MATRIX ?= yes # Custom matrix file
SERIAL_LINK_ENABLE = yes SERIAL_LINK_ENABLE = yes
VISUALIZER_ENABLE ?= yes VISUALIZER_ENABLE ?= yes
LCD_ENABLE ?= yes LCD_ENABLE ?= yes
LED_ENABLE ?= no BACKLIGHT_ENABLE ?= yes
LCD_BACKLIGHT_ENABLE ?= yes LCD_BACKLIGHT_ENABLE ?= yes
MIDI_ENABLE = no MIDI_ENABLE = no
RGBLIGHT_ENABLE = no RGBLIGHT_ENABLE = no
ifdef LCD_ENABLE
include $(SUBPROJECT_PATH)/drivers/gdisp/st7565ergodox/driver.mk include $(SUBPROJECT_PATH)/drivers/gdisp/st7565ergodox/driver.mk
endif include $(SUBPROJECT_PATH)/drivers/gdisp/IS31FL3731C/driver.mk
ifdef LED_ENABLE
include $(SUBPROJECT_PATH)/drivers/gdisp/IS31FL3731C/driver.mk
endif

2
keyboards/ergodox/keymaps/333fred/Makefile
View File

@ -1,7 +1,7 @@
SUBPROJECT_DEFAULT = infinity SUBPROJECT_DEFAULT = infinity
LCD_BACKLIGHT_ENABLE = yes LCD_BACKLIGHT_ENABLE = yes
LCD_ENABLE = yes LCD_ENABLE = yes
LED_ENABLE = yes BACKLIGHT_ENABLE = yes
BACKLIGHT_ENABLE = yes BACKLIGHT_ENABLE = yes
NKRO_ENABLE = yes NKRO_ENABLE = yes
TAP_DANCE_ENABLE = yes TAP_DANCE_ENABLE = yes

4
quantum/visualizer/visualizer.c
View File

@ -309,7 +309,7 @@ static DECLARE_THREAD_FUNCTION(visualizerThread, arg) {
update_keyframe_animation(animations[i], &state, delta, &sleep_time); update_keyframe_animation(animations[i], &state, delta, &sleep_time);
} }
} }
#ifdef LED_ENABLE #ifdef BACKLIGHT_ENABLE
gdispGFlush(LED_DISPLAY); gdispGFlush(LED_DISPLAY);
#endif #endif
@ -372,7 +372,7 @@ void visualizer_init(void) {
#ifdef LCD_ENABLE #ifdef LCD_ENABLE
LCD_DISPLAY = get_lcd_display(); LCD_DISPLAY = get_lcd_display();
#endif #endif
#ifdef LED_ENABLE #ifdef BACKLIGHT_ENABLE
LED_DISPLAY = get_led_display(); LED_DISPLAY = get_led_display();
#endif #endif

3
quantum/visualizer/visualizer.mk
View File

@ -42,9 +42,8 @@ SRC += $(VISUALIZER_DIR)/resources/lcd_logo.c
OPT_DEFS += -DLCD_BACKLIGHT_ENABLE OPT_DEFS += -DLCD_BACKLIGHT_ENABLE
endif endif
ifeq ($(strip $(LED_ENABLE)), yes) ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
SRC += $(VISUALIZER_DIR)/led_keyframes.c SRC += $(VISUALIZER_DIR)/led_keyframes.c
OPT_DEFS += -DLED_ENABLE
endif endif
include $(GFXLIB)/gfx.mk include $(GFXLIB)/gfx.mk