feat: add cyberpunk Data Drop idle animation

- Integrate the Cyberpunk-themed Data Drop LED idle animation
- Remove other selectable idle styles and their configuration settings from web interface and backend

Author: fhirschmann

src/Led.cpp

@@ -830,7 +830,7 @@ AnimationReturnType Animation_VoltageWarning(const bool startNewAnimation, CRGBS
 AnimationReturnType Animation_Webstream(const bool startNewAnimation, CRGBSet &leds) {
 	// return values
 	bool animationActive = false;
-	bool refresh = false;
+	bool animationRefresh = false;
 	int32_t animationDelay = 0;
 	// static vars
 	static uint8_t ledPosWebstream = 0;
@@ -852,7 +852,7 @@ AnimationReturnType Animation_Webstream(const bool startNewAnimation, CRGBSet &l
 		}
 		animationDelay = 10;
 		timerProgress = 0; // directly show new animation after pause
-		refresh = true;
+		animationRefresh = true;
 	} else {
 		if (startNewAnimation || timerProgress == 0) {
 			leds = CRGB::Black;
@@ -880,15 +880,15 @@ AnimationReturnType Animation_Webstream(const bool startNewAnimation, CRGBSet &l
 					}
 				}
 			}
-			refresh = true;
+			animationRefresh = true;
 		}
 		timerProgress--;
 		animationDelay = 45;
 		if (timerProgress > 0) {
 			animationActive = true;
 		}
 	}
-	return AnimationReturnType(animationActive, animationDelay, refresh);
+	return AnimationReturnType(animationActive, animationDelay, animationRefresh);
 }
 
 // --------------------------------
@@ -897,7 +897,7 @@ AnimationReturnType Animation_Webstream(const bool startNewAnimation, CRGBSet &l
 AnimationReturnType Animation_Rewind(const bool startNewAnimation, CRGBSet &leds) {
 	// return values
 	bool animationActive = false;
-	bool refresh = false;
+	bool animationRefresh = false;
 	int32_t animationDelay = 0;
 	// static vars
 	static uint16_t animationIndex = 0;
@@ -910,48 +910,44 @@ AnimationReturnType Animation_Rewind(const bool startNewAnimation, CRGBSet &leds
 
 		if (animationIndex < (leds.size())) {
 			leds[Led_Address(leds.size() - 1 - animationIndex)] = CRGB::Black;
-			refresh = true;
+			animationRefresh = true;
 			animationDelay = 30;
 			animationIndex++;
 		} else {
 			animationActive = false;
 		}
 	}
-	return AnimationReturnType(animationActive, animationDelay, refresh);
+	return AnimationReturnType(animationActive, animationDelay, animationRefresh);
 }
 
 // --------------------------------
 // Idle Animation
 // --------------------------------
 AnimationReturnType Animation_Idle(const bool startNewAnimation, CRGBSet &leds) {
 	// return values
-	int32_t animationDelay = 0;
+	int32_t animationDelay = 120;
 	bool animationActive = true;
-	bool refresh = true;
+	bool animationRefresh = true;
+
 	// static vars
-	static int16_t ledIndex = 0;
-	// this can be removed to always continue on the last position in idle
+	static int16_t step = 0;
+
 	if (startNewAnimation) {
-		ledIndex = 0;
+		step = 0;
 	}
 
-	if (ledIndex < leds.size()) {
-		CRGB::HTMLColorCode idleColor = Led_GetIdleColor();
-		leds = CRGB::Black;
-		Led_DrawIdleDots(leds, ledIndex, idleColor);
-		if (OPMODE_BLUETOOTH_SOURCE == System_GetOperationMode()) {
-			// animate a bit faster in BT-Source to distinguish between the bluetooth modes
-			animationDelay = 30 * 10;
-		} else {
-			animationDelay = 50 * 10;
+	CRGB idleColor = (CRGB)Led_GetIdleColor();
+
+	leds.fadeToBlackBy(40);
+	if (leds.size() > 0) {
+		int16_t idx = (leds.size() - 1) - (step % leds.size());
+		if (idx >= 0 && idx < leds.size()) {
+			leds[idx] = idleColor;
 		}
-		ledIndex++;
-	} else {
-		animationActive = false;
-		refresh = false;
-		ledIndex = 0;
+		step = (step + 1) % leds.size();
 	}
-	return AnimationReturnType(animationActive, animationDelay, refresh);
+
+	return AnimationReturnType(animationActive, animationDelay, animationRefresh);
 }
 
 // --------------------------------
@@ -1245,7 +1241,7 @@ AnimationReturnType Animation_PlaylistProgress(const bool startNewAnimation, CRG
 AnimationReturnType Animation_BatteryMeasurement(const bool startNewAnimation, CRGBSet &leds) {
 	// return-values
 	static bool animationActive = false;
-	bool refresh = false;
+	bool animationRefresh = false;
 	int32_t animationDelay = 0;
 	// static variables for animation
 	static float staticBatteryLevel = 0.0f; // variable to store the measured battery-voltage
@@ -1267,7 +1263,7 @@ AnimationReturnType Animation_BatteryMeasurement(const bool startNewAnimation, C
 		filledLedCount = 0;
 		animationActive = true;
 		leds = CRGB::Black;
-		refresh = true;
+		animationRefresh = true;
 	}
 	if (gLedSettings.numIndicatorLeds == 1) {
 		if (staticBatteryLevel < 0.3) {
@@ -1277,7 +1273,7 @@ AnimationReturnType Animation_BatteryMeasurement(const bool startNewAnimation, C
 		} else {
 			leds[0] = CRGB::Green;
 		}
-		refresh = true;
+		animationRefresh = true;
 
 		animationDelay = 20 * 100;
 		animationActive = false;
@@ -1293,7 +1289,7 @@ AnimationReturnType Animation_BatteryMeasurement(const bool startNewAnimation, C
 			} else {
 				leds[Led_Address(filledLedCount)] = CRGB::Green;
 			}
-			refresh = true;
+			animationRefresh = true;
 
 			filledLedCount++;
 			animationDelay = 20;
@@ -1302,7 +1298,7 @@ AnimationReturnType Animation_BatteryMeasurement(const bool startNewAnimation, C
 			animationActive = false;
 		}
 	}
-	return AnimationReturnType(animationActive, animationDelay, refresh);
+	return AnimationReturnType(animationActive, animationDelay, animationRefresh);
 }
 #endif
 

src/Led.h

@@ -12,51 +12,32 @@ typedef enum class LedIndicator {
 } LedIndicatorType;
 
 // ordered by priority
-enum class LedAnimationType {
-	Boot = 0,
+enum class LedAnimationType : uint8_t {
+	None = 0,
+	Boot,
 	Shutdown,
 	Error,
 	Ok,
 	VoltageWarning,
 	Volume,
+	Battery,
 	BatteryMeasurement,
+	Webstream,
 	Rewind,
 	Playlist,
-	Speech,
-	Pause,
 	Progress,
-	Webstream,
 	Idle,
 	Busy,
+	Speech,
+	Pause,
 	NoNewAnimation
 };
 
-enum class LedPlaylistProgressStates {
-	FillBar = 0,
-	Wait,
-	EmptyBar,
-	EmptyBarToTarget,
-	Done
-};
-
-struct AnimationReturnType {
-	bool animationActive;
+typedef struct {
+	bool animationActive : 1;
 	int32_t animationDelay;
-	bool animationRefresh;
-
-	void clear() {
-		animationActive = false;
-		animationDelay = 0;
-	}
-	AnimationReturnType()
-		: animationActive(false)
-		, animationDelay(0)
-		, animationRefresh(false) { }
-	AnimationReturnType(bool active, int32_t delay, bool refresh = false)
-		: animationActive(active)
-		, animationDelay(delay)
-		, animationRefresh(refresh) { }
-};
+	bool animationRefresh : 1;
+} AnimationReturnType;
 
 #ifdef NEOPIXEL_ENABLE
 	#define LED_INITIAL_BRIGHTNESS		 16u
@@ -66,28 +47,40 @@ struct AnimationReturnType {
 
 	#include <FastLED.h>
 
-struct LedSettings {
-	uint8_t numIndicatorLeds = NUM_INDICATOR_LEDS;
-	uint8_t numControlLeds = NUM_CONTROL_LEDS;
-	std::vector<uint32_t> controlLedColors;
-	uint8_t numIdleDots = NUM_LEDS_IDLE_DOTS;
-	uint32_t idleColor = IDLE_COLOR;
-	bool offsetLedPause = OFFSET_PAUSE_LEDS;
-	uint32_t progressColorStart = PROGRESS_COLOR_START;
-	uint32_t progressColorEnd = PROGRESS_COLOR_END;
-	int16_t atmoHue = ATMO_HUE;
-	int16_t atmoSaturation = ATMO_SATURATION;
-	uint8_t dimmableStates = DIMMABLE_STATES;
-	bool neopixelReverseRotation;
-	uint8_t ledOffset;
-	bool Led_Pause = false; // Used to pause Neopixel-signalisation (while NVS-writes as this leads to exceptions; don't know why)
-	bool Led_NightMode = false;
-	bool Led_AmbientLight = false;
-	uint8_t Led_InitialBrightness = LED_INITIAL_BRIGHTNESS;
-	uint8_t Led_Brightness = LED_INITIAL_BRIGHTNESS;
-	uint8_t Led_NightBrightness = LED_INITIAL_NIGHT_BRIGHTNESS;
-	uint8_t Led_AmbientBrightness = LED_INITIAL_BRIGHTNESS;
-};
+	enum class LedPlaylistProgressStates : uint8_t {
+		FillBar = 0,
+		Wait,
+		EmptyBar,
+		EmptyBarToTarget,
+		Done
+	};
+
+	struct LedSettings {
+		uint8_t numIndicatorLeds = NUM_INDICATOR_LEDS;
+		uint8_t numControlLeds = NUM_CONTROL_LEDS;
+		std::vector<uint32_t> controlLedColors;
+		uint8_t numIdleDots = NUM_LEDS_IDLE_DOTS;
+		uint32_t idleColor = IDLE_COLOR;
+		bool offsetLedPause = OFFSET_PAUSE_LEDS;
+		uint32_t progressColorStart = PROGRESS_COLOR_START;
+		uint32_t progressColorEnd = PROGRESS_COLOR_END;
+		int16_t atmoHue = ATMO_HUE;
+		int16_t atmoSaturation = ATMO_SATURATION;
+		uint8_t dimmableStates = DIMMABLE_STATES;
+		bool neopixelReverseRotation;
+		uint8_t ledOffset;
+		bool Led_Pause;
+
+		bool Led_NightMode = false;
+		bool Led_AmbientLight = false;
+		uint8_t Led_InitialBrightness = LED_INITIAL_BRIGHTNESS;
+		uint8_t Led_Brightness = LED_INITIAL_BRIGHTNESS;
+		uint8_t Led_NightBrightness = LED_INITIAL_NIGHT_BRIGHTNESS;
+		uint8_t Led_AmbientBrightness = LED_INITIAL_BRIGHTNESS;
+	};
+
+	bool Led_GetNightmode();
+	bool Led_GetAmbientLight();
 #endif
 
 void Led_Init(void);
@@ -102,8 +95,6 @@ void Led_TaskPause(void);
 void Led_TaskResume(void);
 
 void Led_SetNightmode(bool enabled);
-bool Led_GetNightmode();
 void Led_ToggleNightmode();
 void Led_SetAmbientLight(bool enabled);
-bool Led_GetAmbientLight();
 void Led_ToggleAmbientLight();

src/Web.cpp

@@ -1096,9 +1096,9 @@ static void settingsToJSON(JsonObject obj, const String section) {
 		ledObj["numControl"].set(numControlLeds);
 		if (numControlLeds > 0) {
 			// get control led colors from NVS
-			std::vector<CRGB::HTMLColorCode> controlLedColors = CONTROL_LEDS_COLORS;
+			std::vector<uint32_t> controlLedColors = CONTROL_LEDS_COLORS;
 			size_t keySize = gPrefsSettings.getBytesLength("controlColors");
-			if (keySize == (numControlLeds * sizeof(CRGB::HTMLColorCode))) {
+			if (keySize == (numControlLeds * sizeof(uint32_t))) {
 				controlLedColors.resize(numControlLeds);
 				gPrefsSettings.getBytes("controlColors", controlLedColors.data(), keySize);
 			}
@@ -1237,7 +1237,7 @@ static void settingsToJSON(JsonObject obj, const String section) {
 		ledSettings["offsetStart"].set(0);
 	#endif
 		JsonArray colorArr = ledSettings["controlColors"].to<JsonArray>();
-		std::vector<CRGB::HTMLColorCode> controlLedColors = CONTROL_LEDS_COLORS;
+		std::vector<uint32_t> controlLedColors = CONTROL_LEDS_COLORS;
 		for (uint8_t controlLed = 0; controlLed < controlLedColors.size(); controlLed++) {
 			colorArr.add(controlLedColors[controlLed]);
 		}

src/settings.h

@@ -219,7 +219,7 @@
 		#define CHIPSET					WS2812B     	// type of Neopixel
 		#define COLOR_ORDER				GRB
 		#define NUM_LEDS_IDLE_DOTS		4           	// count of LEDs, which are shown when Idle
-		#define IDLE_COLOR			CRGB::White	// color of the idle dots
+		#define IDLE_COLOR			0xFFFFFF	// color of the idle dots
 		#define OFFSET_PAUSE_LEDS		false		// if true the pause-leds are centered in the mid of the LED-Strip
 		#define PROGRESS_COLOR_START		0x00FF00	// start color of the progress bar
 		#define PROGRESS_COLOR_END		0xFF0000	// end color of the progress bar