1
0
Fork 0

Move LCD backlight keyframes to its own file

This commit is contained in:
Fred Sundvik 2017-04-05 08:48:30 +03:00
parent 5815c5d317
commit 5ba228b684
7 changed files with 100 additions and 59 deletions

View file

@ -28,6 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "visualizer.h" #include "visualizer.h"
#include "lcd_keyframes.h" #include "lcd_keyframes.h"
#include "lcd_backlight_keyframes.h"
#include "system/serial_link.h" #include "system/serial_link.h"
// To generate an image array like this // To generate an image array like this
@ -140,7 +141,7 @@ static keyframe_animation_t startup_animation = {
.frame_lengths = {0, gfxMillisecondsToTicks(10000), 0}, .frame_lengths = {0, gfxMillisecondsToTicks(10000), 0},
.frame_functions = { .frame_functions = {
display_logo, display_logo,
keyframe_animate_backlight_color, backlight_keyframe_animate_color,
enable_visualization enable_visualization
}, },
}; };
@ -150,7 +151,7 @@ static keyframe_animation_t one_led_color = {
.num_frames = 1, .num_frames = 1,
.loop = false, .loop = false,
.frame_lengths = {gfxMillisecondsToTicks(0)}, .frame_lengths = {gfxMillisecondsToTicks(0)},
.frame_functions = {keyframe_set_backlight_color}, .frame_functions = {backlight_keyframe_set_color},
}; };
bool swap_led_target_color(keyframe_animation_t* animation, visualizer_state_t* state) { bool swap_led_target_color(keyframe_animation_t* animation, visualizer_state_t* state) {
@ -165,7 +166,7 @@ static keyframe_animation_t two_led_colors = {
.num_frames = 2, .num_frames = 2,
.loop = true, .loop = true,
.frame_lengths = {gfxMillisecondsToTicks(1000), gfxMillisecondsToTicks(0)}, .frame_lengths = {gfxMillisecondsToTicks(1000), gfxMillisecondsToTicks(0)},
.frame_functions = {keyframe_set_backlight_color, swap_led_target_color}, .frame_functions = {backlight_keyframe_set_color, swap_led_target_color},
}; };
// The LCD animation alternates between the layer name display and a // The LCD animation alternates between the layer name display and a
@ -190,7 +191,7 @@ static keyframe_animation_t suspend_animation = {
.frame_lengths = {0, gfxMillisecondsToTicks(1000), 0}, .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0},
.frame_functions = { .frame_functions = {
lcd_keyframe_display_layer_text, lcd_keyframe_display_layer_text,
keyframe_animate_backlight_color, backlight_keyframe_animate_color,
keyframe_disable_lcd_and_backlight, keyframe_disable_lcd_and_backlight,
}, },
}; };
@ -202,7 +203,7 @@ static keyframe_animation_t resume_animation = {
.frame_functions = { .frame_functions = {
keyframe_enable_lcd_and_backlight, keyframe_enable_lcd_and_backlight,
display_logo, display_logo,
keyframe_animate_backlight_color, backlight_keyframe_animate_color,
enable_visualization, enable_visualization,
}, },
}; };

View file

@ -28,6 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "visualizer.h" #include "visualizer.h"
#include "lcd_keyframes.h" #include "lcd_keyframes.h"
#include "lcd_backlight_keyframes.h"
#include "system/serial_link.h" #include "system/serial_link.h"
#include "led.h" #include "led.h"
@ -114,7 +115,7 @@ static keyframe_animation_t startup_animation = {
.frame_lengths = {0, gfxMillisecondsToTicks(10000), 0}, .frame_lengths = {0, gfxMillisecondsToTicks(10000), 0},
.frame_functions = { .frame_functions = {
display_logo, display_logo,
keyframe_animate_backlight_color, backlight_keyframe_animate_color,
enable_visualization enable_visualization
}, },
}; };
@ -132,7 +133,7 @@ static keyframe_animation_t suspend_animation = {
.frame_lengths = {0, gfxMillisecondsToTicks(1000), 0}, .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0},
.frame_functions = { .frame_functions = {
lcd_keyframe_display_layer_text, lcd_keyframe_display_layer_text,
keyframe_animate_backlight_color, backlight_keyframe_animate_color,
keyframe_disable_lcd_and_backlight, keyframe_disable_lcd_and_backlight,
}, },
}; };
@ -144,7 +145,7 @@ static keyframe_animation_t resume_animation = {
.frame_functions = { .frame_functions = {
keyframe_enable_lcd_and_backlight, keyframe_enable_lcd_and_backlight,
display_logo, display_logo,
keyframe_animate_backlight_color, backlight_keyframe_animate_color,
enable_visualization, enable_visualization,
}, },
}; };
@ -157,7 +158,7 @@ static keyframe_animation_t color_animation = {
// this prevents the color from changing when activating the layer // this prevents the color from changing when activating the layer
// momentarily // momentarily
.frame_lengths = {gfxMillisecondsToTicks(200), gfxMillisecondsToTicks(500)}, .frame_lengths = {gfxMillisecondsToTicks(200), gfxMillisecondsToTicks(500)},
.frame_functions = {keyframe_no_operation, keyframe_animate_backlight_color}, .frame_functions = {keyframe_no_operation, backlight_keyframe_animate_color},
}; };
void initialize_user_visualizer(visualizer_state_t* state) { void initialize_user_visualizer(visualizer_state_t* state) {

View file

@ -0,0 +1,61 @@
/* Copyright 2017 Fred Sundvik
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "lcd_backlight_keyframes.h"
bool backlight_keyframe_animate_color(keyframe_animation_t* animation, visualizer_state_t* state) {
int frame_length = animation->frame_lengths[animation->current_frame];
int current_pos = frame_length - animation->time_left_in_frame;
uint8_t t_h = LCD_HUE(state->target_lcd_color);
uint8_t t_s = LCD_SAT(state->target_lcd_color);
uint8_t t_i = LCD_INT(state->target_lcd_color);
uint8_t p_h = LCD_HUE(state->prev_lcd_color);
uint8_t p_s = LCD_SAT(state->prev_lcd_color);
uint8_t p_i = LCD_INT(state->prev_lcd_color);
uint8_t d_h1 = t_h - p_h; //Modulo arithmetic since we want to wrap around
int d_h2 = t_h - p_h;
// Chose the shortest way around
int d_h = abs(d_h2) < d_h1 ? d_h2 : d_h1;
int d_s = t_s - p_s;
int d_i = t_i - p_i;
int hue = (d_h * current_pos) / frame_length;
int sat = (d_s * current_pos) / frame_length;
int intensity = (d_i * current_pos) / frame_length;
//dprintf("%X -> %X = %X\n", p_h, t_h, hue);
hue += p_h;
sat += p_s;
intensity += p_i;
state->current_lcd_color = LCD_COLOR(hue, sat, intensity);
lcd_backlight_color(
LCD_HUE(state->current_lcd_color),
LCD_SAT(state->current_lcd_color),
LCD_INT(state->current_lcd_color));
return true;
}
bool backlight_keyframe_set_color(keyframe_animation_t* animation, visualizer_state_t* state) {
(void)animation;
state->prev_lcd_color = state->target_lcd_color;
state->current_lcd_color = state->target_lcd_color;
lcd_backlight_color(
LCD_HUE(state->current_lcd_color),
LCD_SAT(state->current_lcd_color),
LCD_INT(state->current_lcd_color));
return false;
}

View file

@ -0,0 +1,27 @@
/* Copyright 2017 Fred Sundvik
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef QUANTUM_VISUALIZER_LCD_BACKLIGHT_KEYFRAMES_H_
#define QUANTUM_VISUALIZER_LCD_BACKLIGHT_KEYFRAMES_H_
#include "visualizer.h"
// Animates the LCD backlight color between the current color and the target color (of the state)
bool backlight_keyframe_animate_color(keyframe_animation_t* animation, visualizer_state_t* state);
// Sets the backlight color to the target color
bool backlight_keyframe_set_color(keyframe_animation_t* animation, visualizer_state_t* state);
#endif /* QUANTUM_VISUALIZER_LCD_BACKLIGHT_KEYFRAMES_H_ */

View file

@ -228,52 +228,6 @@ bool keyframe_no_operation(keyframe_animation_t* animation, visualizer_state_t*
return false; return false;
} }
#ifdef LCD_BACKLIGHT_ENABLE
bool keyframe_animate_backlight_color(keyframe_animation_t* animation, visualizer_state_t* state) {
int frame_length = animation->frame_lengths[animation->current_frame];
int current_pos = frame_length - animation->time_left_in_frame;
uint8_t t_h = LCD_HUE(state->target_lcd_color);
uint8_t t_s = LCD_SAT(state->target_lcd_color);
uint8_t t_i = LCD_INT(state->target_lcd_color);
uint8_t p_h = LCD_HUE(state->prev_lcd_color);
uint8_t p_s = LCD_SAT(state->prev_lcd_color);
uint8_t p_i = LCD_INT(state->prev_lcd_color);
uint8_t d_h1 = t_h - p_h; //Modulo arithmetic since we want to wrap around
int d_h2 = t_h - p_h;
// Chose the shortest way around
int d_h = abs(d_h2) < d_h1 ? d_h2 : d_h1;
int d_s = t_s - p_s;
int d_i = t_i - p_i;
int hue = (d_h * current_pos) / frame_length;
int sat = (d_s * current_pos) / frame_length;
int intensity = (d_i * current_pos) / frame_length;
//dprintf("%X -> %X = %X\n", p_h, t_h, hue);
hue += p_h;
sat += p_s;
intensity += p_i;
state->current_lcd_color = LCD_COLOR(hue, sat, intensity);
lcd_backlight_color(
LCD_HUE(state->current_lcd_color),
LCD_SAT(state->current_lcd_color),
LCD_INT(state->current_lcd_color));
return true;
}
bool keyframe_set_backlight_color(keyframe_animation_t* animation, visualizer_state_t* state) {
(void)animation;
state->prev_lcd_color = state->target_lcd_color;
state->current_lcd_color = state->target_lcd_color;
lcd_backlight_color(
LCD_HUE(state->current_lcd_color),
LCD_SAT(state->current_lcd_color),
LCD_INT(state->current_lcd_color));
return false;
}
#endif // LCD_BACKLIGHT_ENABLE
bool keyframe_disable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state) { bool keyframe_disable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state) {
(void)animation; (void)animation;
(void)state; (void)state;

View file

@ -129,10 +129,6 @@ void run_next_keyframe(keyframe_animation_t* animation, visualizer_state_t* stat
// Some predefined keyframe functions that can be used by the user code // Some predefined keyframe functions that can be used by the user code
// Does nothing, useful for adding delays // Does nothing, useful for adding delays
bool keyframe_no_operation(keyframe_animation_t* animation, visualizer_state_t* state); bool keyframe_no_operation(keyframe_animation_t* animation, visualizer_state_t* state);
// Animates the LCD backlight color between the current color and the target color (of the state)
bool keyframe_animate_backlight_color(keyframe_animation_t* animation, visualizer_state_t* state);
// Sets the backlight color to the target color
bool keyframe_set_backlight_color(keyframe_animation_t* animation, visualizer_state_t* state);
bool keyframe_disable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state); bool keyframe_disable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state);
bool keyframe_enable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state); bool keyframe_enable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state);

View file

@ -35,6 +35,7 @@ endif
ifeq ($(strip $(LCD_ENABLE)), yes) ifeq ($(strip $(LCD_ENABLE)), yes)
SRC += $(VISUALIZER_DIR)/lcd_backlight.c SRC += $(VISUALIZER_DIR)/lcd_backlight.c
SRC += $(VISUALIZER_DIR)/lcd_keyframes.c SRC += $(VISUALIZER_DIR)/lcd_keyframes.c
SRC += $(VISUALIZER_DIR)/lcd_backlight_keyframes.c
OPT_DEFS += -DLCD_BACKLIGHT_ENABLE OPT_DEFS += -DLCD_BACKLIGHT_ENABLE
endif endif