summaryrefslogtreecommitdiff
path: root/keyboards/ergodox
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2017-04-08 22:30:37 +0300
committerFred Sundvik <fsundvik@gmail.com>2017-04-09 18:34:59 +0300
commitc6ca996f4eaa4cce90e02c123230e1e655c9465a (patch)
treefcd84ef62dfa042718782e49c10a658b99c118ca /keyboards/ergodox
parented1710589f2f63e485c8780c7c8c03e0f65136a0 (diff)
Combine startup and resume animations
Diffstat (limited to 'keyboards/ergodox')
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c3
-rw-r--r--keyboards/ergodox/infinity/visualizer.c20
2 files changed, 6 insertions, 17 deletions
diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c
index 5b7b6d44c4..b04ad02935 100644
--- a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c
+++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c
@@ -127,7 +127,6 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
write_cmd(g, ST7565_INVERT_DISPLAY);
write_cmd(g, ST7565_ALLON_NORMAL);
- write_cmd(g, ST7565_DISPLAY_ON);
write_cmd(g, ST7565_START_LINE | 0);
write_cmd(g, ST7565_RMW);
@@ -143,7 +142,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
g->g.Width = GDISP_SCREEN_WIDTH;
g->g.Height = GDISP_SCREEN_HEIGHT;
g->g.Orientation = GDISP_ROTATE_0;
- g->g.Powermode = powerOn;
+ g->g.Powermode = powerOff;
g->g.Backlight = GDISP_INITIAL_BACKLIGHT;
g->g.Contrast = GDISP_INITIAL_CONTRAST;
return TRUE;
diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c
index 8c3f3f29fc..7ae371c5fc 100644
--- a/keyboards/ergodox/infinity/visualizer.c
+++ b/keyboards/ergodox/infinity/visualizer.c
@@ -77,10 +77,12 @@ _Static_assert(sizeof(visualizer_user_data_t) <= VISUALIZER_USER_DATA_SIZE,
// Don't worry, if the startup animation is long, you can use the keyboard like normal
// during that time
static keyframe_animation_t startup_animation = {
- .num_frames = 2,
+ .num_frames = 4,
.loop = false,
- .frame_lengths = {0, gfxMillisecondsToTicks(10000), 0},
+ .frame_lengths = {0, 0, 0, gfxMillisecondsToTicks(10000), 0},
.frame_functions = {
+ lcd_keyframe_enable,
+ backlight_keyframe_enable,
lcd_keyframe_draw_logo,
backlight_keyframe_animate_color,
},
@@ -137,18 +139,6 @@ static keyframe_animation_t suspend_animation = {
},
};
-static keyframe_animation_t resume_animation = {
- .num_frames = 4,
- .loop = false,
- .frame_lengths = {0, 0, 0, gfxMillisecondsToTicks(10000), 0},
- .frame_functions = {
- lcd_keyframe_enable,
- backlight_keyframe_enable,
- lcd_keyframe_draw_logo,
- backlight_keyframe_animate_color,
- },
-};
-
void initialize_user_visualizer(visualizer_state_t* state) {
// The brightness will be dynamically adjustable in the future
// But for now, change it here.
@@ -312,7 +302,7 @@ void user_visualizer_resume(visualizer_state_t* state) {
state->current_lcd_color = initial_color;
state->target_lcd_color = logo_background_color;
lcd_state = LCD_STATE_INITIAL;
- start_keyframe_animation(&resume_animation);
+ start_keyframe_animation(&startup_animation);
}
void ergodox_board_led_on(void){