Merge branch 'led_clockless_spi' into no_more_audio_task

# Conflicts:
#	platformio.ini

Author: Joe91

changelog.md

@@ -2,6 +2,8 @@
 
 ## DEV-branch
 
+* 12.06.2025: Fix compilation error with NEOPIXEL_REVERSE_ROTATION (#369), thanks to @SZenglein !
+* 12.06.2025: Clear ping- and trackProgress intervals when websocket reconnects (#368), thanks to @SZenglein !
 * 10.05.2025: MQTT: switch from pubsubclient to IDF-MQTT (#363), thanks to @Joe91
 * 05.05.2025: Switch DEV-branch to Arduino 3.2.0 (ESP-IDF 5.4.1)
 * 30.04.2025: Fix loosing Websocket Ping/Pong connection, thanks to @Joe91 !

html/management.html

@@ -2087,14 +2087,18 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
 		/* File Explorer functions end */
 		var socket = undefined;
 		var tm;
+		var pingInterval;
+		var getTrackProgressInterval;
 		var volumeSlider = new Slider("#setVolume");
 		document.getElementById('setVolume').remove();
 
 		function connect() {
 			socket = new WebSocket("ws://" + host + "/ws");
 			socket.onopen = function () {
-				setInterval(ping, 3000);
-				setInterval(getTrackProgress, 1000);
+				clearInterval(pingInterval);
+				clearInterval(getTrackProgressInterval);
+				pingInterval = setInterval(ping, 3000);
+				setTrackProgressInterval = setInterval(getTrackProgress, 1000);
 				// clear old socket messages
 				socket.sendBuffer = [];
 				socket.send('{"settings":{"settings":"settings"}}'); // request settings

install_dependencies.py

@@ -0,0 +1,15 @@
+import os
+import subprocess
+
+def install_dependencies():
+    try:
+        # Überprüfen, ob das Modul bereits installiert ist
+        import rich
+        print("Module 'rich' is already installed.")
+    except ImportError:
+        print("Module 'rich' is not installed. Let's try to install it...")
+        # Installation des Moduls mit pip
+        subprocess.check_call([os.sys.executable, '-m', 'pip', 'install', 'rich'])
+
+if __name__ == "__main__":
+    install_dependencies()

platformio.ini

@@ -17,7 +17,7 @@ board_build.flash_mode = qio
 board_build.bootloader = dio
 board_build.partitions = custom_4mb_noota.csv
 ;platform = espressif32@^6.10.0 ; Arduino 2.0.17 (ESP-IDF 4.4.7)
-platform = https://github.com/pioarduino/platform-espressif32/releases/download/54.03.20/platform-espressif32.zip ; Arduino 3.2.0 (ESP-IDF 5.4.1)
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/54.03.21/platform-espressif32.zip ; Arduino 3.2.1 (ESP-IDF 5.4.2)
 ;framework = arduino
 framework = arduino, espidf
 monitor_speed = 115200
@@ -26,15 +26,16 @@ monitor_filters = esp32_exception_decoder
 ;upload_port = /dev/cu.SLAB_USBtoUART
 ;upload_speed = 115200
 extra_scripts =
+    pre:install_dependencies.py
     pre:gitVersion.py
     pre:updateSdkConfig.py
     pre:processHtml.py
 lib_deps =
 	https://github.com/schreibfaul1/ESP32-audioI2S.git#f394a91 ; v3.3.2 + bugfix large files
 	https://github.com/madhephaestus/ESP32Encoder.git#2c986e0
 	https://github.com/peterus/ESP-FTP-Server-Lib.git#554959f
-	https://github.com/FastLED/FastLED.git#99d5863 ; v3.10.1+ fix
-	https://github.com/ESP32Async/ESPAsyncWebServer.git#1baee81 ; v3.7.7
+	https://github.com/FastLED/FastLED.git#8abc9c6 ; v3.10.1+ fix of issue 16188
+	https://github.com/ESP32Async/ESPAsyncWebServer.git#f06bca1 ; v3.7.8
 	https://github.com/bblanchon/ArduinoJson.git#3252013 ; v7.4.1
 	https://github.com/pschatzmann/arduino-audio-tools.git#c19fbd6 ; v1.0.2
 	https://github.com/pschatzmann/ESP32-A2DP.git#8faaafa ; v1.8.7

src/Led.cpp

@@ -18,8 +18,6 @@
 #include <esp_task_wdt.h>
 
 #ifdef NEOPIXEL_ENABLE
-	#include <FastLED.h>
-
 	#define LED_INDICATOR_SET(indicator)	((Led_Indicators) |= (1u << ((uint8_t) indicator)))
 	#define LED_INDICATOR_IS_SET(indicator) (((Led_Indicators) & (1u << ((uint8_t) indicator))) > 0u)
 	#define LED_INDICATOR_CLEAR(indicator)	((Led_Indicators) &= ~(1u << ((uint8_t) indicator)))
@@ -108,7 +106,7 @@ bool Led_LoadSettings(LedSettings &settings) {
 
 	// get reverse rotation from NVS
 	#ifdef NEOPIXEL_REVERSE_ROTATION
-	const bool defReverseRotation = NEOPIXEL_REVERSE_ROTATION;
+	const bool defReverseRotation = true;
 	#else
 	const bool defReverseRotation = false;
 	#endif
@@ -359,6 +357,7 @@ static void Led_Task(void *parameter) {
 	FastLED.addLeds<CHIPSET, LED_PIN, COLOR_ORDER>(leds, numIndicatorLeds + numControlLeds).setCorrection(TypicalSMD5050);
 	FastLED.setBrightness(gLedSettings.Led_Brightness);
 	FastLED.setDither(DISABLE_DITHER);
+	FastLED.setMaxRefreshRate(200); // limit LED refresh rate to 200Hz (less likely to cause flickering)
 
 	LedAnimationType activeAnimation = LedAnimationType::NoNewAnimation;
 	LedAnimationType nextAnimation = LedAnimationType::NoNewAnimation;
@@ -537,6 +536,9 @@ static void Led_Task(void *parameter) {
 		// get the time to wait and delay the task
 		if ((animationTimer > 0) && (animationTimer < taskDelay)) {
 			taskDelay = animationTimer;
+			if (taskDelay < 5) {
+				taskDelay = 5; // minimum delay
+			}
 		}
 		animationTimer -= taskDelay;
 		vTaskDelay(portTICK_PERIOD_MS * taskDelay);

src/Led.h

@@ -62,6 +62,10 @@ struct AnimationReturnType {
 	#define LED_INITIAL_BRIGHTNESS		 16u
 	#define LED_INITIAL_NIGHT_BRIGHTNESS 2u
 
+	#define FASTLED_ESP32_USE_CLOCKLESS_SPI 1
+
+	#include <FastLED.h>
+
 struct LedSettings {
 	uint8_t numIndicatorLeds = NUM_INDICATOR_LEDS;
 	uint8_t numControlLeds = NUM_CONTROL_LEDS;

src/Web.cpp

@@ -11,9 +11,6 @@
 #include "Common.h"
 #include "ESPAsyncWebServer.h"
 #include "EnumUtils.h"
-#ifdef NEOPIXEL_ENABLE
-	#include <FastLED.h>
-#endif
 #include "Ftp.h"
 #include "HTMLbinary.h"
 #include "HallEffectSensor.h"

src/revision.h

@@ -1,4 +1,4 @@
 #pragma once
 
 #include "gitrevision.h"
-constexpr const char softwareRevision[] = "Software-revision: 20250515-1-DEV";
+constexpr const char softwareRevision[] = "Software-revision: 20250612-1-DEV";