Support custom DMX output value

wled00/cfg.cpp

@@ -751,11 +751,15 @@ 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(), 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(), MAX_CHANNELS_PER_FIXTURE); i++) {
+    CJSON(DMXChannelsValue[i],dmx_chsval[i]);
+  }
+
   CJSON(e131ProxyUniverse, dmx[F("e131proxy")]);
   #endif
 
@@ -1253,10 +1257,15 @@ 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 < MAX_CHANNELS_PER_FIXTURE; i++) {
+    dmx_chsval.add(DMXChannelsValue[i]);
+  }
+
   dmx[F("e131proxy")] = e131ProxyUniverse;
   #endif
 

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

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(){

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 (custom DV per channel).
+          dmx.write(DMXAddr, DMXChannelsValue[j]);
           break;
         case 1:        // Red
           dmx.write(DMXAddr, calc_brightness ? (r * brightness) / 255 : r);
@@ -58,7 +58,7 @@ 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.
+        case 6:        // Legacy: "Set to 255" (pre-custom DV). Keep for backward-compatibility.
           dmx.write(DMXAddr, 255);
           break;
       }

wled00/set.cpp

@@ -640,11 +640,16 @@ 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<MAX_CHANNELS_PER_FIXTURE; i++) {
+      String argname = "DV" + String((i+1));
+      t = request->arg(argname).toInt();
+      DMXChannelsValue[i] = constrain(t, 0, 255);
+    }
   }
   #endif
 

wled00/wled.h

@@ -473,7 +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 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

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,20 +343,23 @@ void loadSettingsFromEEPROM()
   //1024-2047 reserved
 
   #ifdef WLED_ENABLE_DMX
-  // DMX (2530 - 2549)2535
+  // 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);
 
-  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
-  DMXStartLED = EEPROM.read(2550);
+  DMXStartLED = EEPROM.read(2550) + ((EEPROM.read(2551) << 8) & 0xFF00);
+  for (int i=0;i<MAX_CHANNELS_PER_FIXTURE;i++) {
+    DMXChannelsValue[i] = EEPROM.read(2552+i);
+  } //last used: 2566
   #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)
 }
 

wled00/wled_server.cpp

@@ -134,10 +134,15 @@ 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<MAX_CHANNELS_PER_FIXTURE; i++) {
+      mapJS += String(DMXChannelsValue[i]) + ',';
+    }
+    mapJS += F("0];");
   }
   return mapJS;
 }

wled00/xml.cpp

@@ -634,21 +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]);
+    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 < MAX_CHANNELS_PER_FIXTURE; i++) {
+      char buf[5];
+      snprintf_P(buf, sizeof(buf), PSTR("DV%d"), i+1);
+      printSetFormValue(settingsScript,buf,DMXChannelsValue[i]);
+    }
   }
   #endif