darkkirb/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Combine startup and resume animations

Browse source
This commit is contained in:
Fred Sundvik 2017-04-08 22:30:37 +03:00
parent ed1710589f
commit c6ca996f4e
3 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c
View file

@ -127,7 +127,6 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
write_cmd(g, ST7565_INVERT_DISPLAY); write_cmd(g, ST7565_INVERT_DISPLAY);
write_cmd(g, ST7565_ALLON_NORMAL); write_cmd(g, ST7565_ALLON_NORMAL);
write_cmd(g, ST7565_DISPLAY_ON);
write_cmd(g, ST7565_START_LINE | 0); write_cmd(g, ST7565_START_LINE | 0);
write_cmd(g, ST7565_RMW); 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.Width = GDISP_SCREEN_WIDTH;
g->g.Height = GDISP_SCREEN_HEIGHT; g->g.Height = GDISP_SCREEN_HEIGHT;
g->g.Orientation = GDISP_ROTATE_0; g->g.Orientation = GDISP_ROTATE_0;
g->g.Powermode = powerOn; g->g.Powermode = powerOff;
g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Backlight = GDISP_INITIAL_BACKLIGHT;
g->g.Contrast = GDISP_INITIAL_CONTRAST; g->g.Contrast = GDISP_INITIAL_CONTRAST;
return TRUE; return TRUE;

20
keyboards/ergodox/infinity/visualizer.c
View file

@ -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 // Don't worry, if the startup animation is long, you can use the keyboard like normal
// during that time // during that time
static keyframe_animation_t startup_animation = { static keyframe_animation_t startup_animation = {
.num_frames = 2, .num_frames = 4,
.loop = false, .loop = false,
.frame_lengths = {0, gfxMillisecondsToTicks(10000), 0}, .frame_lengths = {0, 0, 0, gfxMillisecondsToTicks(10000), 0},
.frame_functions = { .frame_functions = {
lcd_keyframe_enable,
backlight_keyframe_enable,
lcd_keyframe_draw_logo, lcd_keyframe_draw_logo,
backlight_keyframe_animate_color, 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) { void initialize_user_visualizer(visualizer_state_t* state) {
// The brightness will be dynamically adjustable in the future // The brightness will be dynamically adjustable in the future
// But for now, change it here. // 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->current_lcd_color = initial_color;
state->target_lcd_color = logo_background_color; state->target_lcd_color = logo_background_color;
lcd_state = LCD_STATE_INITIAL; lcd_state = LCD_STATE_INITIAL;
start_keyframe_animation(&resume_animation); start_keyframe_animation(&startup_animation);
} }
void ergodox_board_led_on(void){ void ergodox_board_led_on(void){

8
quantum/visualizer/lcd_backlight.c
View file

@ -25,10 +25,10 @@ SOFTWARE.
#include "lcd_backlight.h" #include "lcd_backlight.h"
#include <math.h> #include <math.h>
static uint8_t current_hue = 0x00; static uint8_t current_hue = 0;
static uint8_t current_saturation = 0x00; static uint8_t current_saturation = 0;
static uint8_t current_intensity = 0xFF; static uint8_t current_intensity = 0;
static uint8_t current_brightness = 0x7F; static uint8_t current_brightness = 0;
void lcd_backlight_init(void) { void lcd_backlight_init(void) {
lcd_backlight_hal_init(); lcd_backlight_hal_init();