Refactor: put max channels per fixture in a define

Author: mrv96

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]);
   }
 

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/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;

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

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);

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];");

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]);