Merge branch 'wled:main' into main

Author: srg74

.github/copilot-instructions.md

@@ -85,7 +85,7 @@ wled00/                 # Main firmware source (C++)
   │   ├── settings*.htm # Settings pages
   │   └── *.js/*.css   # Frontend resources
   ├── *.cpp/*.h        # Firmware source files
-  └── html_*.h         # Generated embedded web files (DO NOT EDIT)
+  └── html_*.h         # Auto-generated embedded web files (DO NOT EDIT, DO NOT COMMIT)
 tools/                 # Build tools (Node.js)
   ├── cdata.js         # Web UI build script
   └── cdata-test.js    # Test suite
@@ -101,7 +101,7 @@ package.json           # Node.js dependencies and scripts
 - `wled00/wled.h` - Main firmware configuration
 - `platformio.ini` - Hardware build targets and settings
 
-### Development Workflow
+### Development Workflow (applies to agent mode only)
 1. **For web UI changes**:
    - Edit files in `wled00/data/`
    - Run `npm run build` to regenerate headers
@@ -148,10 +148,13 @@ package.json           # Node.js dependencies and scripts
 
 ## Important Notes
 
-- **DO NOT edit `wled00/html_*.h` files** - they are auto-generated
-- **Always commit both source files AND generated html_*.h files**
-- **Web UI must be built before firmware compilation**
+- **Always commit source files**
+- **Web UI re-built is part of the platformio firmware compilation**
+- **do not commit generated html_*.h files**
+- **DO NOT edit `wled00/html_*.h` files** - they are auto-generated. If needed, modify Web UI files in `wled00/data/`.
 - **Test web interface manually after any web UI changes**
+- When reviewing a PR: the PR author does not need to update/commit generated html_*.h files - these files will be auto-generated when building the firmware binary.
+- If updating Web UI files in `wled00/data/`, make use of common functions availeable in `wled00/data/common.js` where possible.
 - **Use VS Code with PlatformIO extension for best development experience**
 - **Hardware builds require appropriate ESP32/ESP8266 development board**
 

usermods/audioreactive/audio_source.h

@@ -624,7 +624,7 @@ class I2SAdcSource : public I2SSource {
       }
 
       // see example in https://github.com/espressif/arduino-esp32/blob/master/libraries/ESP32/examples/I2S/HiFreq_ADC/HiFreq_ADC.ino
-      adc1_config_channel_atten(adc1_channel_t(channel), ADC_ATTEN_DB_11);   // configure ADC input amplification
+      adc1_config_channel_atten(adc1_channel_t(channel), ADC_ATTEN_DB_12);   // configure ADC input amplification
 
       #if defined(I2S_GRAB_ADC1_COMPLETELY)
       // according to docs from espressif, the ADC needs to be started explicitly

usermods/pixels_dice_tray/led_effects.h

@@ -40,7 +40,7 @@ static pixels::RollEvent GetLastRollForSegment() {
  * Alternating pixels running function (copied static function).
  */
 // paletteBlend: 0 - wrap when moving, 1 - always wrap, 2 - never wrap, 3 - none (undefined)
-#define PALETTE_SOLID_WRAP   (strip.paletteBlend == 1 || strip.paletteBlend == 3)
+#define PALETTE_SOLID_WRAP   (paletteBlend == 1 || paletteBlend == 3)
 static void running_copy(uint32_t color1, uint32_t color2, bool theatre = false) {
   int width = (theatre ? 3 : 1) + (SEGMENT.intensity >> 4);  // window
   uint32_t cycleTime = 50 + (255 - SEGMENT.speed);

usermods/user_fx/user_fx.cpp

@@ -3,7 +3,7 @@
 // for information how FX metadata strings work see https://kno.wled.ge/interfaces/json-api/#effect-metadata
 
 // paletteBlend: 0 - wrap when moving, 1 - always wrap, 2 - never wrap, 3 - none (undefined)
-#define PALETTE_SOLID_WRAP   (strip.paletteBlend == 1 || strip.paletteBlend == 3)
+#define PALETTE_SOLID_WRAP   (paletteBlend == 1 || paletteBlend == 3)
 
 #define indexToVStrip(index, stripNr) ((index) | (int((stripNr)+1)<<16))
 
@@ -874,7 +874,7 @@ static void handleBoundary(Ant& ant, float& position, bool gatherFood, bool atSt
 // Helper function to calculate ant color
 static uint32_t getAntColor(int antIndex, int numAnts, bool usePalette) {
   if (usePalette)
-    return SEGMENT.color_from_palette(antIndex * 255 / numAnts, false, (strip.paletteBlend == 1 || strip.paletteBlend == 3), 255);
+    return SEGMENT.color_from_palette(antIndex * 255 / numAnts, false, (paletteBlend == 1 || paletteBlend == 3), 255);
   // Alternate between two colors for default palette
   return (antIndex % 3 == 1) ? SEGCOLOR(0) : SEGCOLOR(2);
 }

wled00/FX.cpp

@@ -65,8 +65,8 @@
 
 #define IBN 5100
 // paletteBlend: 0 - wrap when moving, 1 - always wrap, 2 - never wrap, 3 - none (undefined)
-#define PALETTE_SOLID_WRAP   (strip.paletteBlend == 1 || strip.paletteBlend == 3)
-#define PALETTE_MOVING_WRAP !(strip.paletteBlend == 2 || (strip.paletteBlend == 0 && SEGMENT.speed == 0))
+#define PALETTE_SOLID_WRAP   (paletteBlend == 1 || paletteBlend == 3)
+#define PALETTE_MOVING_WRAP !(paletteBlend == 2 || (paletteBlend == 0 && SEGMENT.speed == 0))
 
 #define indexToVStrip(index, stripNr) ((index) | (int((stripNr)+1)<<16))
 
@@ -3398,7 +3398,7 @@ void mode_glitter()
       counter = counter >> 8;
     }
 
-    bool noWrap = (strip.paletteBlend == 2 || (strip.paletteBlend == 0 && SEGMENT.speed == 0));
+    bool noWrap = (paletteBlend == 2 || (paletteBlend == 0 && SEGMENT.speed == 0));
     for (unsigned i = 0; i < SEGLEN; i++) {
       unsigned colorIndex = (i * 255 / SEGLEN) - counter;
       if (noWrap) colorIndex = map(colorIndex, 0, 255, 0, 240); //cut off blend at palette "end"

wled00/FX.h

@@ -834,7 +834,6 @@ class WS2812FX {
   public:
 
     WS2812FX() :
-      paletteBlend(0),
       now(millis()),
       timebase(0),
       isMatrix(false),
@@ -936,7 +935,7 @@ class WS2812FX {
     inline bool isSuspended() const          { return _suspend; }               // returns true if strip.service() execution is suspended
     inline bool needsUpdate() const          { return _triggered; }             // returns true if strip received a trigger() request
 
-    uint8_t paletteBlend;
+    // uint8_t paletteBlend;  // obsolete - use global paletteBlend instead of strip.paletteBlend
     uint8_t getActiveSegmentsNum() const;
     uint8_t getFirstSelectedSegId() const;
     uint8_t getLastActiveSegmentId() const;

wled00/cfg.cpp

@@ -176,7 +176,8 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
   CJSON(cctICused, hw_led[F("ic")]);
   uint8_t cctBlending = hw_led[F("cb")] | Bus::getCCTBlend();
   Bus::setCCTBlend(cctBlending);
-  strip.setTargetFps(hw_led["fps"]); //NOP if 0, default 42 FPS
+  unsigned targetFPS = hw_led["fps"] | WLED_FPS;
+  strip.setTargetFps(targetFPS); //unlimited if 0, default 42 FPS
 
   #ifndef WLED_DISABLE_2D
   // 2D Matrix Settings

wled00/data/settings_sec.htm

@@ -3,7 +3,7 @@
 <head>
 	<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport">
 	<meta charset="utf-8">
-	<title>Misc Settings</title>
+	<title>Security & Update Setup</title>
 	<style> html { visibility: hidden; } </style> <!-- prevent white & ugly display while loading, unhidden in loadResources() -->
 	<script>
 		// load common.js with retry on error
@@ -45,7 +45,7 @@
 	<div class="helpB"><button type="button" onclick="H('features/settings/#security-settings')">?</button></div>
 	<button type="button" onclick="B()">Back</button><button type="submit">Save</button><hr>
 	</div>
-		<h2>Security & Update setup</h2>
+		<h2>Security & Update Setup</h2>
 	<div class="sec">
 		Settings PIN: <input type="password" id="PIN" name="PIN" size="4" maxlength="4" minlength="4" onkeydown="checkNum(this)" pattern="[0-9]*" inputmode="numeric" title="Please enter a 4 digit number"><br>
 		<div class="warn">&#9888; Unencrypted transmission. Be prudent when selecting PIN, do NOT use your banking, door, SIM, etc. pin!</div><br>

wled00/data/update.htm

@@ -19,12 +19,21 @@
 		}
 		function GetV() {
 			// Fetch device info via JSON API instead of compiling it in
-			fetch('/json/info')
+			fetch(getURL('/json/info'))
 				.then(response => response.json())
 				.then(data => {
 					document.querySelector('.installed-version').textContent = `${data.brand} ${data.ver} (${data.vid})`;
 					document.querySelector('.release-name').textContent = data.release;
-					// TODO - assemble update URL
+					// assemble update URL and update release badge
+					if (data.repo && data.repo !== "unknown") {
+						const repoUrl = "https://github.com/" + data.repo + "/releases/latest";
+						const badgeUrl = "https://img.shields.io/github/release/" + data.repo + ".svg?style=flat-square";
+						document.querySelector('.release-repo').href = repoUrl;
+						document.querySelector('.release-badge').src = badgeUrl;
+						toggle('release-download'); // only show release download item after receiving a valid data.repo
+					} else {
+						gId('Norelease-download').classList.add("hide"); // repo invalid -> hide everything
+					}
 					// TODO - can this be done at build time?
 					if (data.arch == "esp8266") {
 						toggle('rev');
@@ -33,7 +42,7 @@
 					if (allowBl) {
 						toggle('bootupd')
 						if (data.bootloaderSHA256) {
-							gId('bootloader-hash').innerText = 'Current bootloader SHA256: ' + data.bootloaderSHA256;
+							gId('bootloader-hash').innerText = 'Current bootloader SHA256: \n' + data.bootloaderSHA256;
 						}
 					}
 				})
@@ -42,9 +51,12 @@
 					// Fallback to compiled-in value if API call fails
 					document.querySelector('.installed-version').textContent = 'Unknown';
 					document.querySelector('.release-name').textContent = 'Unknown';
+					gId('Norelease-download').classList.add("hide"); // fetch failed -> hide everything
 				});
 		}
 		function hideforms() {
+			gId('toprow').classList.add("hide");  // hide top row with "back" button
+			gId('backbtn').classList.add("hide"); // hide "back" button on bottom of the page
 			gId('bootupd').classList.add("hide");
 			toggle('upd');			
 		}
@@ -54,32 +66,45 @@
 	</style>
 </head>
 <body onload="GetV();">
-	<h2>WLED Software Update</h2>	
+	<div id="toprow" class="toprow">
+	<div class="helpB"><button type="button" aria-label="Help" title="Help" onclick="H('basics/getting-started/#software-update-procedure')">?</button></div>
+	<button type="button" onclick="B()">Back</button>
+	</div>
+	<br>
 	<form method='POST' action='./update' id='upd' enctype='multipart/form-data' onsubmit="hideforms()">
+	<div class="sec">
+		<h2>WLED Software Update</h2>
+		<p>
 		Installed version: <span class="sip installed-version">Loading...</span><br>
 		Release: <span class="sip release-name">Loading...</span><br>
-		Download the latest binary: <a href="https://github.com/wled-dev/WLED/releases" target="_blank" 
+		<span id="Norelease-download">Latest binary: Checking...<br></span>
+		<span id="release-download" class="hide">
+		Download the latest binary: <a class="release-repo" href="https://github.com/wled/WLED/releases/latest" target="_blank" rel="noopener noreferrer"
 		style="vertical-align: text-bottom; display: inline-flex;">
-		<img src="https://img.shields.io/github/release/wled-dev/WLED.svg?style=flat-square"></a><br>
+		<img class="release-badge" alt="badge"></a><br> <!-- start with an empty placeholder, src will be filled after fetching /json/info -->
+		</span>
+		</p>
 		<input type="hidden" name="skipValidation" value="" id="sV">
 		<input type='file' name='update' required><br> <!--should have accept='.bin', but it prevents file upload from android app-->
 		<input type='checkbox' onchange="sV.value=checked?1:''" id="skipValidation">
 		<label for='skipValidation'>Ignore firmware validation</label><br>
-		<button type="submit">Update!</button><br>
-		<hr class="sml">
-		<button id="rev" type="button" onclick="cR()">Revert update</button><br>
-		<button type="button" onclick="B()">Back</button>
+		<button type="submit">Update WLED!</button><br>
+		<span id="rev">
+			<hr class="sml">
+			<button type="button" onclick="cR()">Revert update</button><br>
+		</span>
+	</div>
 	</form>
-	<div id="bootupd" class="hide">
-		<hr class="sml">
+	<div id="bootupd" class="hide sec">
 		<h2>Bootloader Update</h2>
-		<div id="bootloader-hash" class="sip" style="margin-bottom:8px;"></div>
+		<div id="bootloader-hash" class="sip" style="margin-bottom:8px;font-size:15px;white-space:pre-wrap;word-break:break-all;"></div>
 		<form method='POST' action='./updatebootloader' enctype='multipart/form-data' onsubmit="hideforms()">
-			<b>Warning:</b> Only upload verified ESP32 bootloader files!<br>
+			<b>Warning:</b> Only upload verified ESP32 bootloader files!<br><br>
 			<input type='file' name='update' required><br>
 			<button type="submit">Update Bootloader</button>
 		</form>
 	</div>
-	<div id="Noupd" class="hide"><b>Updating...</b><br>Please do not close or refresh the page :)</div>
+	<div id="Noupd" class="hide sec"><b>Updating...</b><br>Please do not close or refresh the page :)</div>
+	<p><button id="backbtn" type="button" onclick="B()">Back</button></p>
 </body>
 </html>

wled00/json.cpp

@@ -810,7 +810,7 @@ void serializeInfo(JsonObject root)
     wifi_info[F("txPower")] = (int) WiFi.getTxPower();
     wifi_info[F("sleep")] = (bool) WiFi.getSleep();
   #endif
-  #if !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32S3)
+  #if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_IDF_TARGET_ESP32) // classic esp32 only: report "esp32" without package details
     root[F("arch")] = "esp32";
   #else
     root[F("arch")] = ESP.getChipModel();