candle animation

jpraus · Dec 23, 2020 · 6f3f299 · 6f3f299
1 parent 9de5e56
commit 6f3f299
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/src/floower-esp32/automaton.cpp b/src/floower-esp32/automaton.cpp
@@ -22,6 +22,8 @@ void Automaton::init() {
   changeState(STATE_STANDBY);
   floower->onLeafTouch([=](FloowerTouchEvent event){ onLeafTouch(event); });
   remote->onTakeOver([=]() { onRemoteTookOver(); }); // remote controller took over
+
+  floower->startAnimation(FloowerColorAnimation::CANDLE);
 }
 
 void Automaton::update() {

diff --git a/src/floower-esp32/floower.cpp b/src/floower-esp32/floower.cpp
@@ -294,7 +294,8 @@ void Floower::startAnimation(FloowerColorAnimation animation) {
     animations.StartAnimation(1, 10000, [=](const AnimationParam& param){ pixelsRainbowAnimationUpdate(param); });
   }
   else if (animation == CANDLE) {
-    animations.StartAnimation(1, 10000, [=](const AnimationParam& param){ pixelsCandleAnimationUpdate(param); });
+    pixelsTargetColor = pixelsColor = RgbColor(255, 100, 0); // orange
+    animations.StartAnimation(1, 100, [=](const AnimationParam& param){ pixelsCandleAnimationUpdate(param); });
   }
 }
 
@@ -322,18 +323,13 @@ void Floower::pixelsRainbowAnimationUpdate(const AnimationParam& param) {
 }
 
 void Floower::pixelsCandleAnimationUpdate(const AnimationParam& param) {
-  HsbColor hsbOriginal = HsbColor(pixelsOriginColor);
-  float hue = hsbOriginal.H + param.progress;
-  if (hue > 1.0) {
-    hue = hue - 1;
-  }
-  pixelsColor = RgbColor(HsbColor(hue, 1, 0.4)); // TODO: fine tune
-  showColor(pixelsColor);
-
   if (param.state == AnimationState_Completed) {
-    if (pixelsTargetColor.CalculateBrightness() > 0) { // while there is something to show
-      animations.RestartAnimation(param.index);
+    HsbColor hsbColor = HsbColor(pixelsTargetColor);
+    for (uint8_t i = 0; i < 7; i++) {
+      hsbColor.B = random(40, 100) / 100.0;
+      pixels.SetPixelColor(i, hsbColor);
     }
+    animations.StartAnimation(param.index, random(20, 200), [=](const AnimationParam& param){ pixelsCandleAnimationUpdate(param); });
   }
 }