diff options
| author | That-Canadian <poole.chris.11@gmail.com> | 2017-07-10 16:52:56 -0400 |
|---|---|---|
| committer | That-Canadian <poole.chris.11@gmail.com> | 2017-07-10 16:52:56 -0400 |
| commit | 07bf8522ca23a7665852bb9defff0749c76f5e91 (patch) | |
| tree | a03aa70cc7e9899c605b5e3597cf15ccdf70182c /keyboards/ergodox/infinity/visualizer.c | |
| parent | 707f4efd99f4dfd7213540f7ee86f0fe8e6ad634 (diff) | |
| parent | 65c10790d4f7b89bef849ed3896db4ea30b13a40 (diff) | |
| download | qmk_firmware-07bf8522ca23a7665852bb9defff0749c76f5e91.tar.gz qmk_firmware-07bf8522ca23a7665852bb9defff0749c76f5e91.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'keyboards/ergodox/infinity/visualizer.c')
| -rw-r--r-- | keyboards/ergodox/infinity/visualizer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index 5b6b32007..4b16021ab 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c | |||
| @@ -31,7 +31,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 31 | #include "lcd_keyframes.h" | 31 | #include "lcd_keyframes.h" |
| 32 | #include "lcd_backlight_keyframes.h" | 32 | #include "lcd_backlight_keyframes.h" |
| 33 | #include "system/serial_link.h" | 33 | #include "system/serial_link.h" |
| 34 | #include "animations.h" | 34 | #include "default_animations.h" |
| 35 | 35 | ||
| 36 | static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0xFF); | 36 | static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0xFF); |
| 37 | static const uint32_t initial_color = LCD_COLOR(0, 0, 0); | 37 | static const uint32_t initial_color = LCD_COLOR(0, 0, 0); |
| @@ -79,7 +79,7 @@ static keyframe_animation_t one_led_color = { | |||
| 79 | .num_frames = 1, | 79 | .num_frames = 1, |
| 80 | .loop = false, | 80 | .loop = false, |
| 81 | .frame_lengths = {gfxMillisecondsToTicks(0)}, | 81 | .frame_lengths = {gfxMillisecondsToTicks(0)}, |
| 82 | .frame_functions = {backlight_keyframe_set_color}, | 82 | .frame_functions = {lcd_backlight_keyframe_set_color}, |
| 83 | }; | 83 | }; |
| 84 | 84 | ||
| 85 | bool swap_led_target_color(keyframe_animation_t* animation, visualizer_state_t* state) { | 85 | bool swap_led_target_color(keyframe_animation_t* animation, visualizer_state_t* state) { |
| @@ -94,7 +94,7 @@ static keyframe_animation_t two_led_colors = { | |||
| 94 | .num_frames = 2, | 94 | .num_frames = 2, |
| 95 | .loop = true, | 95 | .loop = true, |
| 96 | .frame_lengths = {gfxMillisecondsToTicks(1000), gfxMillisecondsToTicks(0)}, | 96 | .frame_lengths = {gfxMillisecondsToTicks(1000), gfxMillisecondsToTicks(0)}, |
| 97 | .frame_functions = {backlight_keyframe_set_color, swap_led_target_color}, | 97 | .frame_functions = {lcd_backlight_keyframe_set_color, swap_led_target_color}, |
| 98 | }; | 98 | }; |
| 99 | 99 | ||
| 100 | // The LCD animation alternates between the layer name display and a | 100 | // The LCD animation alternates between the layer name display and a |
