Fixate brightness and speed sliders

Author: stnkl

README.md

@@ -8,8 +8,7 @@ Control multiple FastLED lightstrip animations on the ESP8266 without reuploadin
 
 - Start/stop/pause multiple animations
 - Set custom static color
-- Set animation speed
-- Control saturation
+- Set animation speed and brightness
 - Alarm: Be woken up to an animation slowly fading in
 - Sunset: Automatically fade in an animation when the sun sets at your location
 - Compatible with [ha-bridge](https://github.com/bwssytems/ha-bridge) via [http requests](https://github.com/stnkl/FastLEDManager/blob/master/Webserver.cpp)

src/Config.cpp

@@ -72,10 +72,6 @@ bool ConfigClass::parseJson(char *input)
     startupAnimation = doc["startupAnimation"].as<String>();
   if (doc.containsKey("color"))
     color = doc["color"].as<String>();
-  if (doc.containsKey("speed"))
-    speed = doc["speed"];
-  if (doc.containsKey("saturation"))
-    saturation = doc["saturation"];
 
   return !error;
 }
@@ -100,8 +96,6 @@ DynamicJsonDocument ConfigClass::getJson(DynamicJsonDocument doc)
   doc["sunsetAnimation"] = sunsetAnimation;
   doc["startupAnimation"] = startupAnimation;
   doc["color"] = color;
-  doc["speed"] = speed;
-  doc["saturation"] = saturation;
 
   return doc;
 }

src/Config.h

@@ -44,10 +44,6 @@ class ConfigClass
   String startupAnimation = "";
   /// Lastly used color for Color animation
   String color = "";
-  /// Current animation speed
-  uint8_t speed = 128;
-  /// Current led saturation
-  uint8_t saturation = 255;
 
   /// Initialize config object by mounting file system and
   /// reading the config file.

src/FastLEDManager.cpp

@@ -37,6 +37,9 @@ void FastLEDManagerClass::initialize(uint16_t numberOfLeds)
     Webserver::initialize();
     Fade::initialize();
   }
+
+  registerSlider(new Slider("Brightness", 0, 255, 255, 1));
+  registerSlider(new Slider("Speed", 0, 255, 127, 1));
 }
 
 void FastLEDManagerClass::enableCycleButton(uint8_t pin)
@@ -130,9 +133,8 @@ void FastLEDManagerClass::clear(bool writeData)
 void FastLEDManagerClass::delay(uint16_t ms)
 {
   unsigned long start = micros();
-  while (micros() - start < 1000.0 * ms * pow(Config.speed - 255, 2) / 16384)
+  while (micros() - start < 1000.0 * ms * pow((FastLEDManager.speed - 255) / 128.0, 2))
   {
-    show();
     handleESPEssentials();
     Fade::handle();
     WebSocket::socket.loop();

src/FastLEDManager.h

@@ -145,6 +145,9 @@ class FastLEDManagerClass : public CFastLED
   /// Current animation status
   AnimationStatus status = STOPPED;
 
+  /// Current animation speed
+  uint8_t speed = 255;
+
   /// Current brightness value in 10bit
   int16_t brightness10;
 

src/WebSocket.cpp

@@ -85,7 +85,18 @@ void handleBinary(uint8_t *binary, uint8_t id)
       FastLEDManager.leds[i] = CRGB(binary[1 + i * 3], binary[2 + i * 3], binary[3 + i * 3]);
     break;
   case 20: // Slider data
-    FastLEDManager.getSlider(binary[1])->value = binary[2];
+    switch (binary[1])
+    {
+      case 0:
+        FastLEDManager.brightness10 = binary[2] * 4 + 3;
+        break;
+      case 1:
+        FastLEDManager.speed = binary[2];
+        break;
+      default:
+        FastLEDManager.getSlider(binary[1])->value = binary[2];
+        break;
+    }
     break;
   case 30: // Request configuration
     DynamicJsonDocument doc(2048);