From 5940087891ffec58d90d552307de56b3240dbbe2 Mon Sep 17 00:00:00 2001
From: mrv96 <mrv96@users.noreply.github.com>
Date: Tue, 26 Aug 2025 11:42:30 +0000
Subject: [PATCH 1/6] Add support to custom DMX output value

---
 wled00/cfg.cpp               | 11 +++++++++++
 wled00/data/settings_dmx.htm | 23 ++++++++++++++++++-----
 wled00/dmx_output.cpp        |  7 ++-----
 wled00/set.cpp               |  5 +++++
 wled00/wled.h                |  1 +
 wled00/wled_eeprom.cpp       | 13 ++++++++-----
 wled00/wled_server.cpp       |  5 +++++
 wled00/xml.cpp               | 16 ++++++++++++++++
 8 files changed, 66 insertions(+), 15 deletions(-)

diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp
index eac6ea25a2..923f22aca5 100644
--- a/wled00/cfg.cpp
+++ b/wled00/cfg.cpp
@@ -756,6 +756,12 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
     CJSON(DMXFixtureMap[i],dmx_fixmap[i]);
   }
 
+  JsonArray dmx_chsval = dmx[F("chsval")];
+  for (int i = 0; i < dmx_chsval.size(); i++) {
+    if (i > 14) break;
+    CJSON(DMXChannelsValue[i],dmx_chsval[i]);
+  }
+
   CJSON(e131ProxyUniverse, dmx[F("e131proxy")]);
   #endif
 
@@ -1257,6 +1263,11 @@ void serializeConfig(JsonObject root) {
     dmx_fixmap.add(DMXFixtureMap[i]);
   }
 
+  JsonArray dmx_chsval = dmx.createNestedArray(F("chsval"));
+  for (unsigned i = 0; i < 15; i++) {
+    dmx_chsval.add(DMXChannelsValue[i]);
+  }
+
   dmx[F("e131proxy")] = e131ProxyUniverse;
   #endif
 
diff --git a/wled00/data/settings_dmx.htm b/wled00/data/settings_dmx.htm
index 7458ec9fe7..837f6d3226 100644
--- a/wled00/data/settings_dmx.htm
+++ b/wled00/data/settings_dmx.htm
@@ -7,10 +7,20 @@
 	<script src="common.js" async type="text/javascript"></script>
 	<script>
 	function HW(){window.open("https://kno.wled.ge/interfaces/dmx-output/");}
-	function GCH(num) {
+	function GCH(num){
 		gId('dmxchannels').innerHTML += "";
 		for (i=0;i<num;i++) {
-			gId('dmxchannels').innerHTML += "<span id=CH" + (i+1) + "s >Channel " + (i+1) + ": <select name=CH" + (i+1) + " id=\"CH" + (i+1) + "\"><option value=0>Set to 0</option><option value=1>Red</option><option value=2>Green</option><option value=3>Blue</option><option value=4>White</option><option value=5>Shutter (Brightness)</option><option value=6>Set to 255</option></select></span><br />\n";
+			gId('dmxchannels').innerHTML += "<span id=CH" + (i+1) + "s >Channel " + (i+1) + ": <select name=CH" + (i+1) + " id=\"CH" + (i+1) + "\"><option value=0>Set to </option><option value=1>Red</option><option value=2>Green</option><option value=3>Blue</option><option value=4>White</option><option value=5>Shutter (Brightness)</option></select><input name=DV" + (i+1) + " id=\"DV" + (i+1) + "\" type=number min=0 max=255></span><br />\n";
+		}
+		for (i=0;i<num;i++) {
+			const dv = gId("DV" + (i+1));
+			gId("CH" + (i+1)).addEventListener("change", (event) => {
+				if (event.target.value == 0) {
+					dv.style.display = "inline";
+				} else {
+					dv.style.display = "none";
+				}
+			});
 		}
 	}
 	function mMap(){
@@ -22,14 +32,17 @@
 			gId("gapwarning").style.display="none";
 		}
 		for (i=0;i<15;i++) {
+			const ch = gId("CH" + (i+1));
 			if (i>=numCh) {
 				gId("CH"+(i+1) + "s").style.opacity = "0.5";
-				gId("CH"+(i+1)).disabled = true;
-				
+				ch.disabled = true;
+				gId("DV"+(i+1)).disabled = true;
 			} else {
 				gId("CH"+(i+1) + "s").style.opacity = "1";
-				gId("CH"+(i+1)).disabled = false;
+				ch.disabled = false;
+				gId("DV"+(i+1)).disabled = false;
 			}
+			ch.dispatchEvent(new Event("change"));
 		}
 	}
 	function S(){
diff --git a/wled00/dmx_output.cpp b/wled00/dmx_output.cpp
index eace2145e6..f241e10c03 100644
--- a/wled00/dmx_output.cpp
+++ b/wled00/dmx_output.cpp
@@ -40,8 +40,8 @@ void handleDMXOutput()
     for (int j = 0; j < DMXChannels; j++) {
       int DMXAddr = DMXFixtureStart + j;
       switch (DMXFixtureMap[j]) {
-        case 0:        // Set this channel to 0. Good way to tell strobe- and fade-functions to fuck right off.
-          dmx.write(DMXAddr, 0);
+        case 0:        // Set this channel to the selected value.
+          dmx.write(DMXAddr, DMXChannelsValue[j]);
           break;
         case 1:        // Red
           dmx.write(DMXAddr, calc_brightness ? (r * brightness) / 255 : r);
@@ -58,9 +58,6 @@ void handleDMXOutput()
         case 5:        // Shutter channel. Controls the brightness.
           dmx.write(DMXAddr, brightness);
           break;
-        case 6:        // Sets this channel to 255. Like 0, but more wholesome.
-          dmx.write(DMXAddr, 255);
-          break;
       }
     }
   }
diff --git a/wled00/set.cpp b/wled00/set.cpp
index 9d79467935..1d8bf80b28 100644
--- a/wled00/set.cpp
+++ b/wled00/set.cpp
@@ -645,6 +645,11 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
       t = request->arg(argname).toInt();
       DMXFixtureMap[i] = t;
     }
+    for (int i=0; i<15; i++) {
+      String argname = "DV" + String((i+1));
+      t = request->arg(argname).toInt();
+      DMXChannelsValue[i] = t;
+    }
   }
   #endif
 
diff --git a/wled00/wled.h b/wled00/wled.h
index 8ec6655977..b47ad0f3e7 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -474,6 +474,7 @@ WLED_GLOBAL bool arlsForceMaxBri _INIT(false);                    // enable to f
   // dmx CONFIG
   WLED_GLOBAL byte DMXChannels _INIT(7);        // number of channels per fixture
   WLED_GLOBAL byte DMXFixtureMap[15] _INIT_N(({ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }));
+  WLED_GLOBAL byte DMXChannelsValue[15] _INIT_N(({ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }));
   // assigns the different channels to different functions. See wled21_dmx.ino for more information.
   WLED_GLOBAL uint16_t DMXGap _INIT(10);          // gap between the fixtures. makes addressing easier because you don't have to memorize odd numbers when climbing up onto a rig.
   WLED_GLOBAL uint16_t DMXStart _INIT(10);        // start address of the first fixture
diff --git a/wled00/wled_eeprom.cpp b/wled00/wled_eeprom.cpp
index fb63bc6460..60ee18675d 100644
--- a/wled00/wled_eeprom.cpp
+++ b/wled00/wled_eeprom.cpp
@@ -16,7 +16,7 @@
 
 //eeprom Version code, enables default settings instead of 0 init on update
 #define EEPVER 22
-#define EEPSIZE 2560  //Maximum is 4096
+#define EEPSIZE 2570  //Maximum is 4096
 //0 -> old version, default
 //1 -> 0.4p 1711272 and up
 //2 -> 0.4p 1711302 and up
@@ -343,7 +343,7 @@ void loadSettingsFromEEPROM()
   //1024-2047 reserved
 
   #ifdef WLED_ENABLE_DMX
-  // DMX (2530 - 2549)2535
+  // DMX (2530 - 2564)2535,2550
   DMXChannels = EEPROM.read(2530);
   DMXGap = EEPROM.read(2531) + ((EEPROM.read(2532) << 8) & 0xFF00);
   DMXStart = EEPROM.read(2533) + ((EEPROM.read(2534) << 8) & 0xFF00);
@@ -351,12 +351,15 @@ void loadSettingsFromEEPROM()
   for (int i=0;i<15;i++) {
     DMXFixtureMap[i] = EEPROM.read(2535+i);
   } //last used: 2549
-  DMXStartLED = EEPROM.read(2550);
+  for (int i=0;i<15;i++) {
+    DMXChannelsValue[i] = EEPROM.read(2550+i);
+  } //last used: 2564
+  DMXStartLED = EEPROM.read(2565);
   #endif
 
   //Usermod memory
-  //2551 - 2559 reserved for Usermods, usable by default
-  //2560 - 2943 usable, NOT reserved (need to increase EEPSIZE accordingly, new WLED core features may override this section)
+  //2571 - 2579 reserved for Usermods, usable by default
+  //2580 - 2943 usable, NOT reserved (need to increase EEPSIZE accordingly, new WLED core features may override this section)
   //2944 - 3071 reserved for Usermods (need to increase EEPSIZE to 3072 in const.h)
 }
 
diff --git a/wled00/wled_server.cpp b/wled00/wled_server.cpp
index 12e2862953..ac6ef1a2f4 100644
--- a/wled00/wled_server.cpp
+++ b/wled00/wled_server.cpp
@@ -138,6 +138,11 @@ static String dmxProcessor(const String& var)
       mapJS += String(DMXFixtureMap[i]) + ',';
     }
     mapJS += F("0];");
+    mapJS += F(";\nvar DV=[");
+    for (int i=0; i<15; i++) {
+      mapJS += String(DMXChannelsValue[i]) + ',';
+    }
+    mapJS += F("0];");
   }
   return mapJS;
 }
diff --git a/wled00/xml.cpp b/wled00/xml.cpp
index 40bd992443..100a4da5c9 100644
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -649,6 +649,22 @@ void getSettingsJS(byte subPage, Print& settingsScript)
     printSetFormIndex(settingsScript,PSTR("CH13"),DMXFixtureMap[12]);
     printSetFormIndex(settingsScript,PSTR("CH14"),DMXFixtureMap[13]);
     printSetFormIndex(settingsScript,PSTR("CH15"),DMXFixtureMap[14]);
+
+    printSetFormValue(settingsScript,PSTR("DV1"),DMXChannelsValue[0]);
+    printSetFormValue(settingsScript,PSTR("DV2"),DMXChannelsValue[1]);
+    printSetFormValue(settingsScript,PSTR("DV3"),DMXChannelsValue[2]);
+    printSetFormValue(settingsScript,PSTR("DV4"),DMXChannelsValue[3]);
+    printSetFormValue(settingsScript,PSTR("DV5"),DMXChannelsValue[4]);
+    printSetFormValue(settingsScript,PSTR("DV6"),DMXChannelsValue[5]);
+    printSetFormValue(settingsScript,PSTR("DV7"),DMXChannelsValue[6]);
+    printSetFormValue(settingsScript,PSTR("DV8"),DMXChannelsValue[7]);
+    printSetFormValue(settingsScript,PSTR("DV9"),DMXChannelsValue[8]);
+    printSetFormValue(settingsScript,PSTR("DV10"),DMXChannelsValue[9]);
+    printSetFormValue(settingsScript,PSTR("DV11"),DMXChannelsValue[10]);
+    printSetFormValue(settingsScript,PSTR("DV12"),DMXChannelsValue[11]);
+    printSetFormValue(settingsScript,PSTR("DV13"),DMXChannelsValue[12]);
+    printSetFormValue(settingsScript,PSTR("DV14"),DMXChannelsValue[13]);
+    printSetFormValue(settingsScript,PSTR("DV15"),DMXChannelsValue[14]);
   }
   #endif
 

From 708c76ccb2a45c853b9821a468722719d016748f Mon Sep 17 00:00:00 2001
From: mrv96 <mrv96@users.noreply.github.com>
Date: Tue, 26 Aug 2025 11:46:32 +0000
Subject: [PATCH 2/6] Minor refactor: replace for break with MIN()

---
 wled00/cfg.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp
index 923f22aca5..c62730ae10 100644
--- a/wled00/cfg.cpp
+++ b/wled00/cfg.cpp
@@ -751,14 +751,12 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
   CJSON(DMXStartLED,dmx[F("start-led")]);
 
   JsonArray dmx_fixmap = dmx[F("fixmap")];
-  for (int i = 0; i < dmx_fixmap.size(); i++) {
-    if (i > 14) break;
+  for (int i = 0; i < MIN(dmx_fixmap.size(), 15); i++) {
     CJSON(DMXFixtureMap[i],dmx_fixmap[i]);
   }
 
   JsonArray dmx_chsval = dmx[F("chsval")];
-  for (int i = 0; i < dmx_chsval.size(); i++) {
-    if (i > 14) break;
+  for (int i = 0; i < MIN(dmx_chsval.size(), 15); i++) {
     CJSON(DMXChannelsValue[i],dmx_chsval[i]);
   }
 

From b4d976d06051cf5f3976d6f63f00238b8a33bbe0 Mon Sep 17 00:00:00 2001
From: mrv96 <mrv96@users.noreply.github.com>
Date: Thu, 28 Aug 2025 10:11:56 +0200
Subject: [PATCH 3/6] Refactor: roll some unrolled settings prints

---
 wled00/xml.cpp | 42 +++++++++++-------------------------------
 1 file changed, 11 insertions(+), 31 deletions(-)

diff --git a/wled00/xml.cpp b/wled00/xml.cpp
index 100a4da5c9..0c15c0cbdc 100644
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -634,37 +634,17 @@ void getSettingsJS(byte subPage, Print& settingsScript)
     printSetFormValue(settingsScript,PSTR("CS"),DMXStart);
     printSetFormValue(settingsScript,PSTR("SL"),DMXStartLED);
 
-    printSetFormIndex(settingsScript,PSTR("CH1"),DMXFixtureMap[0]);
-    printSetFormIndex(settingsScript,PSTR("CH2"),DMXFixtureMap[1]);
-    printSetFormIndex(settingsScript,PSTR("CH3"),DMXFixtureMap[2]);
-    printSetFormIndex(settingsScript,PSTR("CH4"),DMXFixtureMap[3]);
-    printSetFormIndex(settingsScript,PSTR("CH5"),DMXFixtureMap[4]);
-    printSetFormIndex(settingsScript,PSTR("CH6"),DMXFixtureMap[5]);
-    printSetFormIndex(settingsScript,PSTR("CH7"),DMXFixtureMap[6]);
-    printSetFormIndex(settingsScript,PSTR("CH8"),DMXFixtureMap[7]);
-    printSetFormIndex(settingsScript,PSTR("CH9"),DMXFixtureMap[8]);
-    printSetFormIndex(settingsScript,PSTR("CH10"),DMXFixtureMap[9]);
-    printSetFormIndex(settingsScript,PSTR("CH11"),DMXFixtureMap[10]);
-    printSetFormIndex(settingsScript,PSTR("CH12"),DMXFixtureMap[11]);
-    printSetFormIndex(settingsScript,PSTR("CH13"),DMXFixtureMap[12]);
-    printSetFormIndex(settingsScript,PSTR("CH14"),DMXFixtureMap[13]);
-    printSetFormIndex(settingsScript,PSTR("CH15"),DMXFixtureMap[14]);
-
-    printSetFormValue(settingsScript,PSTR("DV1"),DMXChannelsValue[0]);
-    printSetFormValue(settingsScript,PSTR("DV2"),DMXChannelsValue[1]);
-    printSetFormValue(settingsScript,PSTR("DV3"),DMXChannelsValue[2]);
-    printSetFormValue(settingsScript,PSTR("DV4"),DMXChannelsValue[3]);
-    printSetFormValue(settingsScript,PSTR("DV5"),DMXChannelsValue[4]);
-    printSetFormValue(settingsScript,PSTR("DV6"),DMXChannelsValue[5]);
-    printSetFormValue(settingsScript,PSTR("DV7"),DMXChannelsValue[6]);
-    printSetFormValue(settingsScript,PSTR("DV8"),DMXChannelsValue[7]);
-    printSetFormValue(settingsScript,PSTR("DV9"),DMXChannelsValue[8]);
-    printSetFormValue(settingsScript,PSTR("DV10"),DMXChannelsValue[9]);
-    printSetFormValue(settingsScript,PSTR("DV11"),DMXChannelsValue[10]);
-    printSetFormValue(settingsScript,PSTR("DV12"),DMXChannelsValue[11]);
-    printSetFormValue(settingsScript,PSTR("DV13"),DMXChannelsValue[12]);
-    printSetFormValue(settingsScript,PSTR("DV14"),DMXChannelsValue[13]);
-    printSetFormValue(settingsScript,PSTR("DV15"),DMXChannelsValue[14]);
+    for (int i = 0; i < 15; i++) {
+      char buf[5];
+      snprintf_P(buf, sizeof(buf), PSTR("CH%d"), i+1);
+      printSetFormIndex(settingsScript,buf,DMXFixtureMap[i]);
+    }
+
+    for (int i = 0; i < 15; i++) {
+      char buf[5];
+      snprintf_P(buf, sizeof(buf), PSTR("DV%d"), i+1);
+      printSetFormValue(settingsScript,buf,DMXChannelsValue[i]);
+    }
   }
   #endif
 

From a0ed79b09d2e25abe84d48bf950042b85412ca04 Mon Sep 17 00:00:00 2001
From: mrv96 <mrv96@users.noreply.github.com>
Date: Mon, 1 Sep 2025 11:34:56 +0200
Subject: [PATCH 4/6] Refactor: put max channels per fixture in a define

---
 wled00/cfg.cpp         | 8 ++++----
 wled00/const.h         | 4 ++++
 wled00/set.cpp         | 4 ++--
 wled00/wled.h          | 4 ++--
 wled00/wled_eeprom.cpp | 4 ++--
 wled00/wled_server.cpp | 4 ++--
 wled00/xml.cpp         | 4 ++--
 7 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp
index c62730ae10..b2f6e23a2c 100644
--- a/wled00/cfg.cpp
+++ b/wled00/cfg.cpp
@@ -751,12 +751,12 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
   CJSON(DMXStartLED,dmx[F("start-led")]);
 
   JsonArray dmx_fixmap = dmx[F("fixmap")];
-  for (int i = 0; i < MIN(dmx_fixmap.size(), 15); i++) {
+  for (int i = 0; i < MIN(dmx_fixmap.size(), MAX_CHANNELS_PER_FIXTURE); i++) {
     CJSON(DMXFixtureMap[i],dmx_fixmap[i]);
   }
 
   JsonArray dmx_chsval = dmx[F("chsval")];
-  for (int i = 0; i < MIN(dmx_chsval.size(), 15); i++) {
+  for (int i = 0; i < MIN(dmx_chsval.size(), MAX_CHANNELS_PER_FIXTURE); i++) {
     CJSON(DMXChannelsValue[i],dmx_chsval[i]);
   }
 
@@ -1257,12 +1257,12 @@ void serializeConfig(JsonObject root) {
   dmx[F("start-led")] = DMXStartLED;
 
   JsonArray dmx_fixmap = dmx.createNestedArray(F("fixmap"));
-  for (unsigned i = 0; i < 15; i++) {
+  for (unsigned i = 0; i < MAX_CHANNELS_PER_FIXTURE; i++) {
     dmx_fixmap.add(DMXFixtureMap[i]);
   }
 
   JsonArray dmx_chsval = dmx.createNestedArray(F("chsval"));
-  for (unsigned i = 0; i < 15; i++) {
+  for (unsigned i = 0; i < MAX_CHANNELS_PER_FIXTURE; i++) {
     dmx_chsval.add(DMXChannelsValue[i]);
   }
 
diff --git a/wled00/const.h b/wled00/const.h
index 1abf245396..704f15f75a 100644
--- a/wled00/const.h
+++ b/wled00/const.h
@@ -655,4 +655,8 @@ static_assert(WLED_MAX_BUSSES <= 32, "WLED_MAX_BUSSES exceeds hard limit");
   #define IRAM_ATTR_YN IRAM_ATTR
 #endif
 
+#ifdef WLED_ENABLE_DMX
+  #define MAX_CHANNELS_PER_FIXTURE 15
+#endif
+
 #endif
diff --git a/wled00/set.cpp b/wled00/set.cpp
index 1d8bf80b28..eb67c80895 100644
--- a/wled00/set.cpp
+++ b/wled00/set.cpp
@@ -640,12 +640,12 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
     if (t>=0 && t < MAX_LEDS) {
       DMXStartLED = t;
     }
-    for (int i=0; i<15; i++) {
+    for (int i=0; i<MAX_CHANNELS_PER_FIXTURE; i++) {
       String argname = "CH" + String((i+1));
       t = request->arg(argname).toInt();
       DMXFixtureMap[i] = t;
     }
-    for (int i=0; i<15; i++) {
+    for (int i=0; i<MAX_CHANNELS_PER_FIXTURE; i++) {
       String argname = "DV" + String((i+1));
       t = request->arg(argname).toInt();
       DMXChannelsValue[i] = t;
diff --git a/wled00/wled.h b/wled00/wled.h
index b47ad0f3e7..7f9f8cefef 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -473,8 +473,8 @@ WLED_GLOBAL bool arlsForceMaxBri _INIT(false);                    // enable to f
   WLED_GLOBAL uint16_t e131ProxyUniverse _INIT(0);                  // output this E1.31 (sACN) / ArtNet universe via MAX485 (0 = disabled)
   // dmx CONFIG
   WLED_GLOBAL byte DMXChannels _INIT(7);        // number of channels per fixture
-  WLED_GLOBAL byte DMXFixtureMap[15] _INIT_N(({ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }));
-  WLED_GLOBAL byte DMXChannelsValue[15] _INIT_N(({ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }));
+  WLED_GLOBAL byte DMXFixtureMap[MAX_CHANNELS_PER_FIXTURE] _INIT_N(({ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }));
+  WLED_GLOBAL byte DMXChannelsValue[MAX_CHANNELS_PER_FIXTURE] _INIT_N(({ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }));
   // assigns the different channels to different functions. See wled21_dmx.ino for more information.
   WLED_GLOBAL uint16_t DMXGap _INIT(10);          // gap between the fixtures. makes addressing easier because you don't have to memorize odd numbers when climbing up onto a rig.
   WLED_GLOBAL uint16_t DMXStart _INIT(10);        // start address of the first fixture
diff --git a/wled00/wled_eeprom.cpp b/wled00/wled_eeprom.cpp
index 60ee18675d..0ad71007f7 100644
--- a/wled00/wled_eeprom.cpp
+++ b/wled00/wled_eeprom.cpp
@@ -348,10 +348,10 @@ void loadSettingsFromEEPROM()
   DMXGap = EEPROM.read(2531) + ((EEPROM.read(2532) << 8) & 0xFF00);
   DMXStart = EEPROM.read(2533) + ((EEPROM.read(2534) << 8) & 0xFF00);
 
-  for (int i=0;i<15;i++) {
+  for (int i=0;i<MAX_CHANNELS_PER_FIXTURE;i++) {
     DMXFixtureMap[i] = EEPROM.read(2535+i);
   } //last used: 2549
-  for (int i=0;i<15;i++) {
+  for (int i=0;i<MAX_CHANNELS_PER_FIXTURE;i++) {
     DMXChannelsValue[i] = EEPROM.read(2550+i);
   } //last used: 2564
   DMXStartLED = EEPROM.read(2565);
diff --git a/wled00/wled_server.cpp b/wled00/wled_server.cpp
index ac6ef1a2f4..76b59e53ca 100644
--- a/wled00/wled_server.cpp
+++ b/wled00/wled_server.cpp
@@ -134,12 +134,12 @@ static String dmxProcessor(const String& var)
     mapJS += F(";\nLC=");
     mapJS += String(strip.getLengthTotal());
     mapJS += F(";\nvar CH=[");
-    for (int i=0; i<15; i++) {
+    for (int i=0; i<MAX_CHANNELS_PER_FIXTURE; i++) {
       mapJS += String(DMXFixtureMap[i]) + ',';
     }
     mapJS += F("0];");
     mapJS += F(";\nvar DV=[");
-    for (int i=0; i<15; i++) {
+    for (int i=0; i<MAX_CHANNELS_PER_FIXTURE; i++) {
       mapJS += String(DMXChannelsValue[i]) + ',';
     }
     mapJS += F("0];");
diff --git a/wled00/xml.cpp b/wled00/xml.cpp
index 0c15c0cbdc..d66240cd4d 100644
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -634,13 +634,13 @@ void getSettingsJS(byte subPage, Print& settingsScript)
     printSetFormValue(settingsScript,PSTR("CS"),DMXStart);
     printSetFormValue(settingsScript,PSTR("SL"),DMXStartLED);
 
-    for (int i = 0; i < 15; i++) {
+    for (int i = 0; i < MAX_CHANNELS_PER_FIXTURE; i++) {
       char buf[5];
       snprintf_P(buf, sizeof(buf), PSTR("CH%d"), i+1);
       printSetFormIndex(settingsScript,buf,DMXFixtureMap[i]);
     }
 
-    for (int i = 0; i < 15; i++) {
+    for (int i = 0; i < MAX_CHANNELS_PER_FIXTURE; i++) {
       char buf[5];
       snprintf_P(buf, sizeof(buf), PSTR("DV%d"), i+1);
       printSetFormValue(settingsScript,buf,DMXChannelsValue[i]);

From a6963f041d5d91e2a636d5582f6bb25dcc52c736 Mon Sep 17 00:00:00 2001
From: mrv96 <mrv96@users.noreply.github.com>
Date: Mon, 1 Sep 2025 12:23:59 +0200
Subject: [PATCH 5/6] Fix DMXStartLED size and position (back-compat.)

---
 wled00/wled_eeprom.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/wled00/wled_eeprom.cpp b/wled00/wled_eeprom.cpp
index 0ad71007f7..5e437469dc 100644
--- a/wled00/wled_eeprom.cpp
+++ b/wled00/wled_eeprom.cpp
@@ -343,7 +343,7 @@ void loadSettingsFromEEPROM()
   //1024-2047 reserved
 
   #ifdef WLED_ENABLE_DMX
-  // DMX (2530 - 2564)2535,2550
+  // DMX (2530 - 2566)2535,2552
   DMXChannels = EEPROM.read(2530);
   DMXGap = EEPROM.read(2531) + ((EEPROM.read(2532) << 8) & 0xFF00);
   DMXStart = EEPROM.read(2533) + ((EEPROM.read(2534) << 8) & 0xFF00);
@@ -351,10 +351,10 @@ void loadSettingsFromEEPROM()
   for (int i=0;i<MAX_CHANNELS_PER_FIXTURE;i++) {
     DMXFixtureMap[i] = EEPROM.read(2535+i);
   } //last used: 2549
+  DMXStartLED = EEPROM.read(2550) + ((EEPROM.read(2551) << 8) & 0xFF00);
   for (int i=0;i<MAX_CHANNELS_PER_FIXTURE;i++) {
-    DMXChannelsValue[i] = EEPROM.read(2550+i);
-  } //last used: 2564
-  DMXStartLED = EEPROM.read(2565);
+    DMXChannelsValue[i] = EEPROM.read(2552+i);
+  } //last used: 2566
   #endif
 
   //Usermod memory

From 316ef2402e26bc990c03af79c21f3a7695588560 Mon Sep 17 00:00:00 2001
From: mrv96 <mrv96@users.noreply.github.com>
Date: Mon, 1 Sep 2025 12:33:35 +0200
Subject: [PATCH 6/6] Prevent random-like DMX values from settings

---
 wled00/set.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/set.cpp b/wled00/set.cpp
index eb67c80895..801b8c48fe 100644
--- a/wled00/set.cpp
+++ b/wled00/set.cpp
@@ -648,7 +648,7 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
     for (int i=0; i<MAX_CHANNELS_PER_FIXTURE; i++) {
       String argname = "DV" + String((i+1));
       t = request->arg(argname).toInt();
-      DMXChannelsValue[i] = t;
+      DMXChannelsValue[i] = constrain(t, 0, 255);
     }
   }
   #endif