1. Reworked the generated code. Optimized it here and there. Reused

   ledRGB(W)Count variable from LedDevice instead of creating a new
   locally
2. Fixed the problem where DMX Max channel count was hardcoded to 512.
   WLED e.g. in MultiRGB mode relies on 510 (3*170) channels. On other
   hand for MultiRGBW it expect 512 (4*128) channels. So obviously it
   has to be a parameter.
3. Updated corresponding configuration for WebUI

Author: lougovsk

assets/webconfig/i18n/en.json

@@ -688,6 +688,7 @@
     "edt_dev_spec_devices_discovery_inprogress": "Discovery in progress",
     "edt_dev_spec_dithering_title": "Dithering",
     "edt_dev_spec_dmaNumber_title": "DMA channel",
+    "edt_dev_spec_dmx_max_title": "DMX maximal number of channels",
     "edt_dev_spec_fullBrightnessAtStart_title": "Full brightness at start",
     "edt_dev_spec_gamma_title": "Gamma",
     "edt_dev_spec_globalBrightnessControlMaxLevel_title": "Max Current Level",

libsrc/leddevice/dev_net/LedDeviceUdpE131.cpp

@@ -40,7 +40,6 @@ const int DMX_MAX = 512; // 512 usable slots
 LedDeviceUdpE131::LedDeviceUdpE131(const QJsonObject &deviceConfig)
 	: ProviderUdp(deviceConfig)
 	, _whiteAlgorithm(RGBW::WhiteAlgorithm::INVALID)
-	, _ledRGBWCount(0)
 {
 }
 
@@ -60,6 +59,7 @@ bool LedDeviceUdpE131::init(const QJsonObject &deviceConfig)
 		_port = deviceConfig[CONFIG_PORT].toInt(E131_DEFAULT_PORT);
 
 		_e131_universe = deviceConfig["universe"].toInt(1);
+		_e131_dmx_max = deviceConfig["dmx-max"].toInt(DMX_MAX);
 		_e131_source_name = deviceConfig["source-name"].toString("hyperion on "+QHostInfo::localHostName());
 		QString _json_cid = deviceConfig["cid"].toString("");
 
@@ -74,17 +74,6 @@ bool LedDeviceUdpE131::init(const QJsonObject &deviceConfig)
 		}
 		Debug(_log, "whiteAlgorithm : %s", QSTRING_CSTR(whiteAlgorithmStr));
 
-		// Calculate RGBW count
-		if (_whiteAlgorithm == RGBW::WhiteAlgorithm::WHITE_OFF)
-		{
-			_ledRGBWCount = _ledCount * 3;
-		}
-		else
-		{
-			_ledRGBWCount = _ledCount * 4;
-		}
-
-
 		if (_json_cid.isEmpty())
 		{
 			_e131_cid = QUuid::createUuid();
@@ -164,7 +153,7 @@ int LedDeviceUdpE131::write(const std::vector<ColorRgb> &ledValues)
 {
 	int retVal = 0;
 	int thisChannelCount = 0;
-	int dmxChannelCount = _ledRGBWCount; // Use _ledRGBWCount
+	int dmxChannelCount = (_whiteAlgorithm == RGBW::WhiteAlgorithm::WHITE_OFF) ? _ledRGBCount : _ledRGBWCount; // if white_off we expect 3 channels per LED otherwise 4 
 
 	// Create a temporary buffer for RGB or RGBW data
 	std::vector<uint8_t> tempBuffer(dmxChannelCount);
@@ -193,26 +182,26 @@ int LedDeviceUdpE131::write(const std::vector<ColorRgb> &ledValues)
 
 	for (int rawIdx = 0; rawIdx < dmxChannelCount; rawIdx++)
 	{
-		if (rawIdx % DMX_MAX == 0) // start of new packet
+		if (rawIdx % _e131_dmx_max == 0) // start of new packet
 		{
-			thisChannelCount = (dmxChannelCount - rawIdx < DMX_MAX) ? dmxChannelCount % DMX_MAX : DMX_MAX;
+			thisChannelCount = (dmxChannelCount - rawIdx < _e131_dmx_max) ? dmxChannelCount % _e131_dmx_max : _e131_dmx_max;
 			// is this the last packet? ? ^^ last packet : ^^ earlier packets
 
-			prepare(_e131_universe + rawIdx / DMX_MAX, thisChannelCount);
+			prepare(_e131_universe + rawIdx / _e131_dmx_max, thisChannelCount);
 			e131_packet.sequence_number = _e131_seq;
 		}
 
-		e131_packet.property_values[1 + rawIdx % DMX_MAX] = rawDataPtr[rawIdx];
+		e131_packet.property_values[1 + rawIdx % _e131_dmx_max] = rawDataPtr[rawIdx];
 
 		// is this the last byte of last packet || last byte of other packets
-		if ((rawIdx == dmxChannelCount - 1) || (rawIdx % DMX_MAX == DMX_MAX - 1))
+		if ((rawIdx == dmxChannelCount - 1) || (rawIdx % _e131_dmx_max == _e131_dmx_max - 1))
 		{
 #undef e131debug
 #if e131debug
 			Debug (_log, "send packet: rawidx %d dmxchannelcount %d universe: %d, packetsz %d"
 				, rawIdx
 				, dmxChannelCount
-				, _e131_universe + rawIdx / DMX_MAX
+				, _e131_universe + rawIdx / _e131_dmx_max
 				, E131_DMP_DATA + 1 + thisChannelCount
 				);
 #endif

libsrc/leddevice/dev_net/LedDeviceUdpE131.h

@@ -141,13 +141,13 @@ class LedDeviceUdpE131 : public ProviderUdp
 	e131_packet_t e131_packet;
 	uint8_t _e131_seq = 0;
 	uint8_t _e131_universe = 1;
+	int _e131_dmx_max = 512;
 	uint8_t _acn_id[12] = {0x41, 0x53, 0x43, 0x2d, 0x45, 0x31, 0x2e, 0x31, 0x37, 0x00, 0x00, 0x00 };
 	QString _e131_source_name;
 	QUuid _e131_cid;
 
 	// RGBW specific members
 	RGBW::WhiteAlgorithm _whiteAlgorithm;
-	int _ledRGBWCount;
 	ColorRgbw _temp_rgbw;
 };
 

libsrc/leddevice/schemas/schema-e131.json

@@ -22,6 +22,12 @@
       "default": 1,
       "propertyOrder": 3
     },
+    "dmx-max": {
+      "type": "integer",
+      "title": "edt_dev_spec_dmx_max_title",
+      "default": 512,
+      "propertyOrder": 4
+    },
     "latchTime": {
       "type": "integer",
       "title": "edt_dev_spec_latchtime_title",
@@ -30,30 +36,43 @@
       "minimum": 0,
       "maximum": 1000,
       "access": "expert",
-      "propertyOrder": 4
+      "propertyOrder": 5
     },
     "cid": {
       "type": "string",
       "title": "edt_dev_spec_cid_title",
-      "propertyOrder": 5
+      "propertyOrder": 6
     },
+
     "whiteAlgorithm": {
       "type": "string",
-      "title": "edt_dev_spec_white_algorithm_title",
-      "enum": [
-        "white_off",
-        "subtractive",
-        "additive"
+      "title":"edt_dev_spec_whiteLedAlgor_title",
+      "enum" : [
+	"subtract_minimum",
+	"sub_min_cool_adjust",
+	"sub_min_warm_adjust",
+	"cold_white",
+	"neutral_white",
+	"auto",
+	"auto_max",
+	"auto_accurate",
+	"white_off"
       ],
       "default": "white_off",
-      "propertyOrder": 6,
-      "options": {
-        "enum_titles": [
-          "edt_dev_spec_white_algorithm_white_off",
-          "edt_dev_spec_white_algorithm_subtractive",
-          "edt_dev_spec_white_algorithm_additive"
-        ]
-      }
+      "options" : {
+	"enum_titles" : [
+	  "edt_dev_enum_subtract_minimum",
+	  "edt_dev_enum_sub_min_cool_adjust",
+	  "edt_dev_enum_sub_min_warm_adjust",
+	  "edt_dev_enum_cold_white",
+	  "edt_dev_enum_neutral_white",
+	  "edt_dev_enum_auto",
+	  "edt_dev_enum_auto_max",
+	  "edt_dev_enum_auto_accurate",
+	  "edt_dev_enum_white_off"
+	]
+      },
+      "propertyOrder" : 7
     }
   },
   "additionalProperties": true