aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2016-04-24 16:26:53 +0300
committerFred Sundvik <fsundvik@gmail.com>2016-04-24 16:26:53 +0300
commit15906b86ae1db858b38bc77393e31e7741223b01 (patch)
treec5f4f48a845bc076662f9738ab45855b37b52236
parent0530ebb77d6961a7edc14f3a5b943165a8b52497 (diff)
downloadfirmware-15906b86ae1db858b38bc77393e31e7741223b01.tar.gz
firmware-15906b86ae1db858b38bc77393e31e7741223b01.tar.bz2
firmware-15906b86ae1db858b38bc77393e31e7741223b01.zip
LEDS are flushed automatically
After running the animation, instead of having to do it manually. This avoids duplicate flushing, and better support for cross-fades.
-rw-r--r--led_test.c4
-rw-r--r--visualizer.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/led_test.c b/led_test.c
index 8c0de604a..c987eca38 100644
--- a/led_test.c
+++ b/led_test.c
@@ -63,7 +63,6 @@ static void keyframe_fade_all_leds_from_to(keyframe_animation_t* animation, uint
uint8_t luma = fade_led_color(animation, from, to);
color_t color = LUMA2COLOR(luma);
gdispGClear(LED_DISPLAY, color);
- gdispGFlush(LED_DISPLAY);
}
// TODO: Should be customizable per keyboard
@@ -102,7 +101,6 @@ bool keyframe_led_left_to_right_gradient(keyframe_animation_t* animation, visual
uint8_t color = compute_gradient_color(t, i, NUM_COLS);
gdispGDrawLine(LED_DISPLAY, i, 0, i, NUM_ROWS - 1, LUMA2COLOR(color));
}
- gdispGFlush(LED_DISPLAY);
return true;
}
@@ -115,7 +113,6 @@ bool keyframe_led_top_to_bottom_gradient(keyframe_animation_t* animation, visual
uint8_t color = compute_gradient_color(t, i, NUM_ROWS);
gdispGDrawLine(LED_DISPLAY, 0, i, NUM_COLS - 1, i, LUMA2COLOR(color));
}
- gdispGFlush(LED_DISPLAY);
return true;
}
@@ -140,6 +137,5 @@ bool keyframe_led_crossfade(keyframe_animation_t* animation, visualizer_state_t*
gdispGDrawPixel(LED_DISPLAY, j, i, color);
}
}
- gdispGFlush(LED_DISPLAY);
return true;
}
diff --git a/visualizer.c b/visualizer.c
index 2ec6e34f5..81ec8298f 100644
--- a/visualizer.c
+++ b/visualizer.c
@@ -127,6 +127,7 @@ void stop_all_keyframe_animations(void) {
}
static bool update_keyframe_animation(keyframe_animation_t* animation, visualizer_state_t* state, systime_t delta, systime_t* sleep_time) {
+ // TODO: Clean up this messy code
dprintf("Animation frame%d, left %d, delta %d\n", animation->current_frame,
animation->time_left_in_frame, delta);
if (animation->current_frame == animation->num_frames) {
@@ -394,6 +395,9 @@ static THD_FUNCTION(visualizerThread, arg) {
update_keyframe_animation(animations[i], &state, delta, &sleep_time);
}
}
+#ifdef LED_ENABLE
+ gdispGFlush(LED_DISPLAY);
+#endif
// The animation can enable the visualizer
// And we might need to update the state when that happens
// so don't sleep