Successful start/stop of comms

PlummersSoftwareLLC · Dec 11, 2023 · ac2ff43 · ac2ff43
1 parent dc27f7e
commit ac2ff43
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 4 deletions.
diff --git a/Server/LEDControllerChannel.cs b/Server/LEDControllerChannel.cs
@@ -142,19 +142,46 @@ protected LEDControllerChannel(string hostName,
             CompressData = compressData;
             RedGreenSwap = swapRedGreen;
             BatchSize = batchSize;
+        }
+
+        ~LEDControllerChannel()
+        {
+            Stop();
+        }
 
+        public bool Start()
+        {
             _cancellationTokenSource = new CancellationTokenSource();
             _Worker = new Thread(WorkerConnectAndSendLoop);
-            _Worker.Name = hostName + " Connect and Send Loop";
+            _Worker.Name = HostName + " Connect and Send Loop";
             _Worker.IsBackground = true;
             _Worker.Priority = ThreadPriority.BelowNormal;
             _Worker.Start();
+            return true;
         }
 
-        ~LEDControllerChannel()
+        // Stop
+        //
+        // Signals the worker thread to exit, waits for it, and closes the socket (if open)
+
+        public bool Stop()
         {
+            // If we don't have a cancellation source, we've been told to stop before startingl likely
+
+            if (null == _cancellationTokenSource)
+                return false;
+
+            // Shut down the controller socket for this strip
+
+            ControllerSocket controllerSocket = ControllerSocketForHost(HostName);
+            if (controllerSocket != null && controllerSocket._socket != null)
+                controllerSocket.Close();
+
+            // Wrap up the worker thread
+
             _cancellationTokenSource.Cancel();
             _Worker.Join();
+            return true;
         }
 
         public bool HasSocket       // Is there a socket at all yet?

diff --git a/Server/SiteController.cs b/Server/SiteController.cs
@@ -1092,8 +1092,8 @@ public class CeilingStrip : Location
 
         private LightStrip[] _StripControllers =
         {
-            new LightStrip("192.168.8.196", "Ceiling A", true, LENGTH, 1, START, true, 0, false) { FramesPerBuffer = 24, BatchSize = 1  },  // 216
-            new LightStrip("192.168.8.1", "Ceiling B", true, LENGTH, 1, START, true, 0, false) { FramesPerBuffer = 24, BatchSize = 1  }  // 216
+            new LightStrip("192.168.8.196", "Ceiling A", true, LENGTH, 1, START, true, 0, false) { FramesPerBuffer = 24, BatchSize = 4  },  // 216
+            //new LightStrip("192.168.8.1", "Ceiling B", true, LENGTH, 1, START, true, 0, false) { FramesPerBuffer = 24, BatchSize = 1  }  // 216
         }; 
 
         public ScheduledEffect[] _LEDEffects =