Pārlūkot izejas kodu

Enable and fix compilation of more files

Fred Sundvik 9 gadi atpakaļ
vecāks
revīzija
4e89732617
2 mainītis faili ar 13 papildinājumiem un 17 dzēšanām
  1. 12 12
      led_test.c
  2. 1 5
      visualizer.mk

+ 12 - 12
led_test.c

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

+ 1 - 5
visualizer.mk

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