Enable and fix compilation of more files

master
Fred Sundvik 2016-05-17 09:45:05 +03:00
parent d79e94adb1
commit 4e89732617
2 changed files with 13 additions and 17 deletions

View File

@ -29,20 +29,20 @@ keyframe_animation_t led_test_animation = {
.num_frames = 14, .num_frames = 14,
.loop = true, .loop = true,
.frame_lengths = { .frame_lengths = {
MS2ST(1000), // fade in gfxMillisecondsToTicks(1000), // fade in
MS2ST(1000), // no op (leds on) gfxMillisecondsToTicks(1000), // no op (leds on)
MS2ST(1000), // fade out gfxMillisecondsToTicks(1000), // fade out
MS2ST(1000), // crossfade gfxMillisecondsToTicks(1000), // crossfade
MS2ST(3000), // left to rigt (outside in) gfxMillisecondsToTicks(3000), // left to rigt (outside in)
MS2ST(1000), // crossfade gfxMillisecondsToTicks(1000), // crossfade
MS2ST(3000), // top_to_bottom gfxMillisecondsToTicks(3000), // top_to_bottom
0, // mirror leds 0, // mirror leds
MS2ST(1000), // crossfade gfxMillisecondsToTicks(1000), // crossfade
MS2ST(3000), // left_to_right (mirrored, so inside out) gfxMillisecondsToTicks(3000), // left_to_right (mirrored, so inside out)
MS2ST(1000), // crossfade gfxMillisecondsToTicks(1000), // crossfade
MS2ST(3000), // top_to_bottom gfxMillisecondsToTicks(3000), // top_to_bottom
0, // normal leds 0, // normal leds
MS2ST(1000), // crossfade gfxMillisecondsToTicks(1000), // crossfade
}, },
.frame_functions = { .frame_functions = {

View File

@ -31,17 +31,15 @@ USE_UGFX = yes
endif endif
ifdef LCD_BACKLIGHT_ENABLE ifdef LCD_BACKLIGHT_ENABLE
ifndef EMULATOR
SRC += $(VISUALIZER_DIR)/lcd_backlight.c SRC += $(VISUALIZER_DIR)/lcd_backlight.c
ifndef EMULATOR
SRC += lcd_backlight_hal.c SRC += lcd_backlight_hal.c
endif endif
UDEFS += -DLCD_BACKLIGHT_ENABLE UDEFS += -DLCD_BACKLIGHT_ENABLE
endif endif
ifdef LED_ENABLE ifdef LED_ENABLE
ifndef EMULATOR
SRC += $(VISUALIZER_DIR)/led_test.c SRC += $(VISUALIZER_DIR)/led_test.c
endif
UDEFS += -DLED_ENABLE UDEFS += -DLED_ENABLE
USE_UGFX = yes USE_UGFX = yes
endif endif
@ -54,10 +52,8 @@ ULIBS += $(patsubst %,-l%,$(patsubst -l%,%,$(GFXLIBS)))
endif endif
ifndef VISUALIZER_USER ifndef VISUALIZER_USER
ifndef EMULATOR
VISUALIZER_USER = visualizer_user.c VISUALIZER_USER = visualizer_user.c
endif endif
endif
SRC += $(VISUALIZER_USER) SRC += $(VISUALIZER_USER)
ifdef EMULATOR ifdef EMULATOR