From 4fdd1d3739fea3f952f5d4deb91904a7c84f55a7 Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Fri, 14 Jun 2019 05:32:55 +0200 Subject: [PATCH] Added animation 'cake'. --- include/animations.h | 1 + src/animations.cpp | 26 ++++++++++++++++++++++++++ src/effects.cpp | 2 ++ 3 files changed, 29 insertions(+) diff --git a/include/animations.h b/include/animations.h index e6a0e45..9086225 100644 --- a/include/animations.h +++ b/include/animations.h @@ -39,3 +39,4 @@ extern AnimationData animation_couple_rain; extern AnimationData animation_couple_snow; extern AnimationData animation_heart; extern AnimationData animation_weather_icons; +extern AnimationData animation_cake; diff --git a/src/animations.cpp b/src/animations.cpp index ef12867..50ae831 100644 --- a/src/animations.cpp +++ b/src/animations.cpp @@ -137,3 +137,29 @@ uint8_t animation_weather_icons_data[] PROGMEM = { uint16_t animation_weather_icons_delays[] = {0}; uint16_t animation_weather_icons_offsets[] = {0,69,210,354,489,621,734,821,925,1061,1216,1359,1479,1627,1772,1841,1954,2060,2166,2308,2421,2551,2681,2763,2845,2927,3009,3093}; AnimationData animation_weather_icons = {&animation_weather_icons_colors[0], &animation_weather_icons_data[0], &animation_weather_icons_offsets[0], &animation_weather_icons_delays[0], false, 15, 27, 16, 16}; + +uint8_t animation_cake_colors[] PROGMEM = {91, 61, 0, 225, 225, 225, 184, 184, 113, 183, 123, 61, 255, 255, 142, 255, 174, 91, 255, 91, 91, 174, 174, 174, 255, 91, 174, 255, 40, 40, 255, 113, 40, 255, 40, 113, 174, 91, 255, 122, 82, 0, 255, 189, 122, 255, 255, 173}; +uint8_t animation_cake_data[] PROGMEM = { + 1,1,1,2,255,7,1,15,255,6,1,2,7,2,1,1,2,1,1,2,7,2,255,5,1,2,8,2,1,2,12,2,1,2,8,2,255,6,1,2,1,1,2,11,2,1,1,2,255,6,1,2,9,2,1,1,2,1,1,2,9,2,255,5,1,2,10,2,1,2,13,2,1,2,10,2,255,5,1,2,9,5,2,5,14,5,2,5,9,2,255,4,1,2,7,10,7,3,7,13,7,3,7,10,7,2,1,1,2,3,4,4,4,3,7,14,7,3,4,4,4,3,2,1,2,255,5,3,4,13,4,255,5,3,2,1,2,4,255,11,3,4,2,1,2,5,255,7,4,6,4,4,6,5,2,1,2,6,255,6,5,4,6,5,4,6,6,2,1,2,5,6,11,7,6,11,7,6,11,7,4,6,5,2,1,1,2,255,11,5,2,255,4,1,255,11,2,255,3,1, + 255,11,0,2,255,23,0,11,0,0,0,7,0,0,0,11,255,11,0,12,255,200,0, + 0,0,0,1,255,14,0,1,2,1,255,6,0,12,255,7,0,7,255,220,0, + 0,0,0,2,255,7,0,1,255,6,0,2,0,2,255,5,0,1,2,1,255,10,0,5,0,0,0,7,255,11,0,7,255,200,0, + 255,22,0,2,255,14,0,2,7,255,14,0,2,7,255,201,0, + 255,39,0,2,1,255,12,0,1,2,255,201,0, + 255,6,0,2,255,15,0,7,255,14,0,1,255,17,0,16,255,149,0,17,255,50,0, + 255,6,0,1,255,15,0,1,255,15,0,2,5,2,0,0,2,255,11,0,5,255,149,0,6,255,50,0, + 255,43,0,7,255,7,0,15,0,0,0,7,255,200,0 +}; +uint16_t animation_cake_delays[] = {80}; +uint16_t animation_cake_offsets[] = {0,200,223,244,279,296,309,332,360,375}; +AnimationData animation_cake = { + &animation_cake_colors[0], + &animation_cake_data[0], + &animation_cake_offsets[0], + &animation_cake_delays[0], + false, /* individual_frame_times */ + 16, /* color_count */ + 9, /* frames_count */ + 16, 16 /* width, height */ +}; + diff --git a/src/effects.cpp b/src/effects.cpp index 61d5636..13baa98 100644 --- a/src/effects.cpp +++ b/src/effects.cpp @@ -30,6 +30,7 @@ StaticEffect effect_off(CRGB(0x000000)); AnimationEffect effect_anim_koopa(&animation_koopa, new CRGB(0x000000), 0, 0); AnimationEffect effect_anim_couple_rain(&animation_couple_rain, new CRGB(0x000000), -8, -16); AnimationEffect effect_anim_heart(&animation_heart, new CRGB(0x000000), 0, 0); +AnimationEffect effect_anim_cake(&animation_cake, new CRGB(0x000000), 0, 0); SingleDynamicEffect effect_single_dynamic; MultiDynamicEffect effect_multi_dynamic; MatrixEffect effect_matrix; @@ -65,6 +66,7 @@ void setup_effects() { effects->add((EffectEntry){"fire", (Effect *)&effect_fire}); effects->add((EffectEntry){"firework", (Effect *)&effect_firework}); effects->add((EffectEntry){"gol", (Effect *)&effect_gol}); + effects->add((EffectEntry){"cake", (Effect *)&effect_anim_cake}); cycle_effects->add(&effect_sinematrix3); cycle_effects->add(&effect_multi_dynamic);