summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2017-04-05 08:40:39 +0300
committerFred Sundvik <fsundvik@gmail.com>2017-04-09 18:34:59 +0300
commit5815c5d317b02d688990980fdf01848e81247c21 (patch)
tree9af8c38a2137e31b95582420683b85ab1e5cd452 /keyboards/ergodox
parent05530b193f4d4476b01c2e7f882619a81194888a (diff)
Move LCD keyframes to its own file
Diffstat (limited to 'keyboards/ergodox')
-rw-r--r--keyboards/ergodox/infinity/visualizer.c7
-rw-r--r--keyboards/ergodox/keymaps/default/visualizer.c5
2 files changed, 7 insertions, 5 deletions
diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c
index c7afd9384c..3abed08db0 100644
--- a/keyboards/ergodox/infinity/visualizer.c
+++ b/keyboards/ergodox/infinity/visualizer.c
@@ -27,6 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif
#include "visualizer.h"
+#include "lcd_keyframes.h"
#include "system/serial_link.h"
// To generate an image array like this
@@ -173,14 +174,14 @@ static keyframe_animation_t lcd_bitmap_animation = {
.num_frames = 1,
.loop = false,
.frame_lengths = {gfxMillisecondsToTicks(0)},
- .frame_functions = {keyframe_display_layer_bitmap},
+ .frame_functions = {lcd_keyframe_display_layer_bitmap},
};
static keyframe_animation_t lcd_bitmap_leds_animation = {
.num_frames = 2,
.loop = true,
.frame_lengths = {gfxMillisecondsToTicks(2000), gfxMillisecondsToTicks(2000)},
- .frame_functions = {keyframe_display_layer_bitmap, keyframe_display_led_states},
+ .frame_functions = {lcd_keyframe_display_layer_bitmap, lcd_keyframe_display_led_states},
};
static keyframe_animation_t suspend_animation = {
@@ -188,7 +189,7 @@ static keyframe_animation_t suspend_animation = {
.loop = false,
.frame_lengths = {0, gfxMillisecondsToTicks(1000), 0},
.frame_functions = {
- keyframe_display_layer_text,
+ lcd_keyframe_display_layer_text,
keyframe_animate_backlight_color,
keyframe_disable_lcd_and_backlight,
},
diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c
index 305aaae157..ef87ac4195 100644
--- a/keyboards/ergodox/keymaps/default/visualizer.c
+++ b/keyboards/ergodox/keymaps/default/visualizer.c
@@ -27,6 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif
#include "visualizer.h"
+#include "lcd_keyframes.h"
#include "system/serial_link.h"
#include "led.h"
@@ -122,7 +123,7 @@ static keyframe_animation_t lcd_layer_display = {
.num_frames = 1,
.loop = false,
.frame_lengths = {gfxMillisecondsToTicks(0)},
- .frame_functions = {keyframe_display_layer_and_led_states}
+ .frame_functions = {lcd_keyframe_display_layer_and_led_states}
};
static keyframe_animation_t suspend_animation = {
@@ -130,7 +131,7 @@ static keyframe_animation_t suspend_animation = {
.loop = false,
.frame_lengths = {0, gfxMillisecondsToTicks(1000), 0},
.frame_functions = {
- keyframe_display_layer_text,
+ lcd_keyframe_display_layer_text,
keyframe_animate_backlight_color,
keyframe_disable_lcd_and_backlight,
},