aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authorGravatar Fred Sundvik <fsundvik@gmail.com>2017-04-05 09:21:18 +0300
committerGravatar Fred Sundvik <fsundvik@gmail.com>2017-04-09 18:34:59 +0300
commit1e7585e76771e1a2d8ca733fc09c19f9fa0e903c (patch)
treee4e5ebff65cd1f60fe4ecdd71501c05bff9b6b24 /keyboards
parent5ba228b684a32c1099efc6207842a56ff102961a (diff)
downloadqmk_firmware-1e7585e76771e1a2d8ca733fc09c19f9fa0e903c.tar.gz
Separated backlight and LCD disable/enable
Also moved them to correct places
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/ergodox/infinity/visualizer.c14
-rw-r--r--keyboards/ergodox/keymaps/default/visualizer.c14
2 files changed, 16 insertions, 12 deletions
diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c
index bbed4e989..8e684d991 100644
--- a/keyboards/ergodox/infinity/visualizer.c
+++ b/keyboards/ergodox/infinity/visualizer.c
@@ -186,22 +186,24 @@ static keyframe_animation_t lcd_bitmap_leds_animation = {
};
static keyframe_animation_t suspend_animation = {
- .num_frames = 3,
+ .num_frames = 4,
.loop = false,
- .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0},
+ .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0, 0},
.frame_functions = {
lcd_keyframe_display_layer_text,
backlight_keyframe_animate_color,
- keyframe_disable_lcd_and_backlight,
+ lcd_keyframe_disable,
+ lcd_keyframe_disable,
},
};
static keyframe_animation_t resume_animation = {
- .num_frames = 4,
+ .num_frames = 5,
.loop = false,
- .frame_lengths = {0, 0, gfxMillisecondsToTicks(10000), 0},
+ .frame_lengths = {0, 0, 0, gfxMillisecondsToTicks(10000), 0},
.frame_functions = {
- keyframe_enable_lcd_and_backlight,
+ lcd_keyframe_enable,
+ backlight_keyframe_enable,
display_logo,
backlight_keyframe_animate_color,
enable_visualization,
diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c
index 07f5a44ab..5ee49c9bc 100644
--- a/keyboards/ergodox/keymaps/default/visualizer.c
+++ b/keyboards/ergodox/keymaps/default/visualizer.c
@@ -128,22 +128,24 @@ static keyframe_animation_t lcd_layer_display = {
};
static keyframe_animation_t suspend_animation = {
- .num_frames = 3,
+ .num_frames = 4,
.loop = false,
- .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0},
+ .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0, 0},
.frame_functions = {
lcd_keyframe_display_layer_text,
backlight_keyframe_animate_color,
- keyframe_disable_lcd_and_backlight,
+ lcd_keyframe_disable,
+ lcd_keyframe_disable,
},
};
static keyframe_animation_t resume_animation = {
- .num_frames = 4,
+ .num_frames = 5,
.loop = false,
- .frame_lengths = {0, 0, gfxMillisecondsToTicks(10000), 0},
+ .frame_lengths = {0, 0, 0, gfxMillisecondsToTicks(10000), 0},
.frame_functions = {
- keyframe_enable_lcd_and_backlight,
+ lcd_keyframe_enable,
+ backlight_keyframe_enable,
display_logo,
backlight_keyframe_animate_color,
enable_visualization,