Fix advatek max number of ports and report errors due to too many pix…

…els which varies in expanded mode.
xLightsSequencer · Jun 6, 2020 · 2468305 · 2468305
1 parent cf005d4
commit 2468305
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/controllers/advatek.xcontroller b/controllers/advatek.xcontroller
@@ -41,7 +41,7 @@
 			<SupportsPixelPortAllSettings/>
 			<SupportsUpload/>
 			<MaxInputUniverses>96</MaxInputUniverses>
-			<MaxPixelPort>4</MaxPixelPort>
+			<MaxPixelPort>8</MaxPixelPort>
 			<MaxSerialPort>1</MaxSerialPort>
 			<MaxSerialPortChannels>512</MaxSerialPortChannels>
 			<MaxPixelPortChannels>3060</MaxPixelPortChannels>
@@ -115,7 +115,7 @@
 			<SupportsPixelPortAllSettings/>
 			<SupportsUpload/>
 			<MaxInputUniverses>96</MaxInputUniverses>
-			<MaxPixelPort>16</MaxPixelPort>
+			<MaxPixelPort>32</MaxPixelPort>
 			<MaxSerialPort>4</MaxSerialPort>
 			<MaxSerialPortChannels>512</MaxSerialPortChannels>
 			<MaxPixelPortChannels>3060</MaxPixelPortChannels>

diff --git a/xLights/controllers/Pixlite16.cpp b/xLights/controllers/Pixlite16.cpp
@@ -889,6 +889,28 @@ bool Pixlite16::SetOutputs(ModelManager* allmodels, OutputManager* outputManager
 
     logger_base.debug(check);
 
+    // Handle varying maximum pixels based on expansion mode
+    int maxPixels = 0;
+    if (_config._numOutputs == 4 || _config._numOutputs == 8)         {
+        // 4 board
+        if (cud.GetMaxPixelPort() > 4) {
+            maxPixels = 510;
+        }
+        else {
+            maxPixels = 1020;
+        }
+    }
+    else if (_config._numOutputs == 16 || _config._numOutputs == 32)
+    {
+        // 16 board
+        if (cud.GetMaxPixelPort() > 16)             {
+            maxPixels = 510;
+        }
+        else             {
+            maxPixels = 1020;
+        }
+    }
+
     std::list<Output*> outputs = controller->GetOutputs();
     if (success && cud.GetMaxPixelPort() > 0) {
         for (int pp = 1; pp <= rules->GetMaxPixelPort(); pp++) {
@@ -899,6 +921,11 @@ bool Pixlite16::SetOutputs(ModelManager* allmodels, OutputManager* outputManager
 
                 UDControllerPort* port = cud.GetControllerPixelPort(pp);
 
+                if (port->Pixels() > maxPixels)                     {
+                    check += wxString::Format("ERR: String port %d has more pixels than this controller supports (%d when maximum is %d).\n", pp, port->Pixels(), maxPixels);
+                    success = false;
+                }
+
                 // update the data
                 _config._currentDriver = DecodeStringPortProtocol(port->GetProtocol());