Merge pull request #1331 from ariasuni/master

[qmk_firmware.git] / quantum / visualizer / visualizer.mk

diff --git a/quantum/visualizer/visualizer.mk b/quantum/visualizer/visualizer.mk
index 149968de72dc4559668905c13f259f5ae8975b51..6f97603bd89a25622b3b39b4cf428beb8fd64a75 100644 (file)
--- a/quantum/visualizer/visualizer.mk
+++ b/quantum/visualizer/visualizer.mk
@@ -20,7 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-SRC += $(VISUALIZER_DIR)/visualizer.c
+SRC += $(VISUALIZER_DIR)/visualizer.c \
+       $(VISUALIZER_DIR)/visualizer_keyframes.c
 EXTRAINCDIRS += $(GFXINC) $(VISUALIZER_DIR)
 GFXLIB = $(LIB_PATH)/ugfx
 VPATH += $(VISUALIZER_PATH)
@@ -32,27 +33,36 @@ OPT_DEFS += -DLCD_ENABLE
 ULIBS += -lm
 endif
 
-ifdef LCD_BACKLIGHT_ENABLE
+ifeq ($(strip $(LCD_ENABLE)), yes)
 SRC += $(VISUALIZER_DIR)/lcd_backlight.c
-ifndef EMULATOR
-SRC += lcd_backlight_hal.c
-endif
+SRC += $(VISUALIZER_DIR)/lcd_keyframes.c
+SRC += $(VISUALIZER_DIR)/lcd_backlight_keyframes.c
+# Note, that the linker will strip out any resources that are not actually in use
+SRC += $(VISUALIZER_DIR)/resources/lcd_logo.c
 OPT_DEFS += -DLCD_BACKLIGHT_ENABLE
 endif
 
-ifdef LED_ENABLE
-SRC += $(VISUALIZER_DIR)/led_test.c
-UDEFS += -DLED_ENABLE
+ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
+SRC += $(VISUALIZER_DIR)/led_keyframes.c
 endif
 
 include $(GFXLIB)/gfx.mk
-SRC += $(patsubst $(TOP_DIR)/%,%,$(GFXSRC))
-OPT_DEFS += $(patsubst %,-D%,$(patsubst -D%,%,$(GFXDEFS)))
+GFXSRC := $(patsubst $(TOP_DIR)/%,%,$(GFXSRC))
+GFXDEFS := $(patsubst %,-D%,$(patsubst -D%,%,$(GFXDEFS)))
 
-ifndef VISUALIZER_USER
-VISUALIZER_USER = visualizer_user.c
+ifneq ("$(wildcard $(KEYMAP_PATH)/visualizer.c)","")
+       SRC += keyboards/$(KEYBOARD)/keymaps/$(KEYMAP)/visualizer.c
+else 
+       ifeq ("$(wildcard $(SUBPROJECT_PATH)/keymaps/$(KEYMAP)/visualizer.c)","")
+               ifeq ("$(wildcard $(SUBPROJECT_PATH)/visualizer.c)","")
+$(error "$(KEYMAP_PATH)/visualizer.c" does not exist)
+               else
+                       SRC += keyboards/$(KEYBOARD)/$(SUBPROJECT)/visualizer.c
+               endif
+       else
+               SRC += keyboards/$(KEYBOARD)/$(SUBPROJECT)/keymaps/$(KEYMAP)/visualizer.c
+       endif
 endif
-SRC += $(VISUALIZER_USER)
 
 ifdef EMULATOR
 UINCDIR += $(TMK_DIR)/common