fix: add ICommunicationMonitor

PepperDash · Jun 5, 2024 · 607b826 · 607b826
1 parent bf352cb
commit 607b826
Show file tree

Hide file tree

Showing 30 changed files with 10 additions and 142 deletions.
diff --git a/pdt_shureMXA_epi/ShureMxwDevice.cs b/pdt_shureMXA_epi/ShureMxwDevice.cs
@@ -13,7 +13,7 @@
 
 namespace pdt_shureMXW_epi
 {
-    public class ShureMxwDevice : EssentialsBridgeableDevice, IPrivacy
+    public class ShureMxwDevice : EssentialsBridgeableDevice, IPrivacy, ICommunicationMonitor
     {
         public Properties Props { get; private set; }
 
@@ -79,7 +79,9 @@ public string Error
 
         public IBasicCommunication Communication { get; private set; }
         public CommunicationGather PortGather { get; private set; }
-        public GenericCommunicationMonitor CommunicationMonitor { get; private set; }
+        private GenericCommunicationMonitor _communicationMonitor;
+
+        public StatusMonitorBase CommunicationMonitor { get { return _communicationMonitor; } }
 
         int CautionThreshold { get; set; }
 
@@ -113,7 +115,7 @@ public ShureMxwDevice(string key, string name, IBasicCommunication comm, Propert
             PortGather = new CommunicationGather(Communication, ">");
             PortGather.LineReceived += LineReceived;
 
-            CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, 15000, 180000, 300000, DoPoll);
+            _communicationMonitor = new GenericCommunicationMonitor(this, Communication, 15000, 180000, 300000, DoPoll);
 
             Init();
         }
@@ -206,7 +208,7 @@ private void Init()
         public override void Initialize()
         {
             Communication.Connect();
-            CommunicationMonitor.Start();
+            _communicationMonitor.Start();
         }
 
         #endregion
@@ -480,7 +482,7 @@ public override void LinkToApi(BasicTriList trilist, uint joinStart, string join
                 bridge.AddJoinMap(Key, joinMap);
             }
 
-            CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
+            _communicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
             Debug.Console(2, this, "Linked Online at {0}", joinMap.IsOnline);
 
             ErrorFeedback.LinkInputSig(trilist.StringInput[joinMap.ErrorString.JoinNumber]);

diff --git a/pdt_shureMXA_epi/bin/Debug/Crestron.SimplSharpPro.DM.dll b/pdt_shureMXA_epi/bin/Debug/Crestron.SimplSharpPro.DM.dll
diff --git a/pdt_shureMXA_epi/bin/Debug/Crestron.SimplSharpPro.DeviceSupport.dll b/pdt_shureMXA_epi/bin/Debug/Crestron.SimplSharpPro.DeviceSupport.dll
diff --git a/pdt_shureMXA_epi/bin/Debug/Crestron.SimplSharpPro.EthernetCommunications.dll b/pdt_shureMXA_epi/bin/Debug/Crestron.SimplSharpPro.EthernetCommunications.dll
diff --git a/pdt_shureMXA_epi/bin/Debug/Crestron.SimplSharpPro.Fusion.dll b/pdt_shureMXA_epi/bin/Debug/Crestron.SimplSharpPro.Fusion.dll
diff --git a/pdt_shureMXA_epi/bin/Debug/Crestron.SimplSharpPro.Gateways.dll b/pdt_shureMXA_epi/bin/Debug/Crestron.SimplSharpPro.Gateways.dll
diff --git a/pdt_shureMXA_epi/bin/Debug/Crestron.SimplSharpPro.GeneralIO.dll b/pdt_shureMXA_epi/bin/Debug/Crestron.SimplSharpPro.GeneralIO.dll
diff --git a/pdt_shureMXA_epi/bin/Debug/Crestron.SimplSharpPro.Lighting.dll b/pdt_shureMXA_epi/bin/Debug/Crestron.SimplSharpPro.Lighting.dll
diff --git a/pdt_shureMXA_epi/bin/Debug/Crestron.SimplSharpPro.Remotes.dll b/pdt_shureMXA_epi/bin/Debug/Crestron.SimplSharpPro.Remotes.dll
diff --git a/pdt_shureMXA_epi/bin/Debug/Crestron.SimplSharpPro.Shades.dll b/pdt_shureMXA_epi/bin/Debug/Crestron.SimplSharpPro.Shades.dll
diff --git a/pdt_shureMXA_epi/bin/Debug/Crestron.SimplSharpPro.ThreeSeriesCards.dll b/pdt_shureMXA_epi/bin/Debug/Crestron.SimplSharpPro.ThreeSeriesCards.dll
diff --git a/pdt_shureMXA_epi/bin/Debug/Crestron.SimplSharpPro.UI.dll b/pdt_shureMXA_epi/bin/Debug/Crestron.SimplSharpPro.UI.dll
diff --git a/pdt_shureMXA_epi/bin/Debug/Essentials Devices Common.dll b/pdt_shureMXA_epi/bin/Debug/Essentials Devices Common.dll
diff --git a/pdt_shureMXA_epi/bin/Debug/PepperDashEssentials.dll b/pdt_shureMXA_epi/bin/Debug/PepperDashEssentials.dll
diff --git a/pdt_shureMXA_epi/bin/Debug/PepperDash_Core.dll b/pdt_shureMXA_epi/bin/Debug/PepperDash_Core.dll
diff --git a/pdt_shureMXA_epi/bin/Debug/PepperDash_Essentials_Core.dll b/pdt_shureMXA_epi/bin/Debug/PepperDash_Essentials_Core.dll
diff --git a/pdt_shureMXA_epi/bin/Debug/PepperDash_Essentials_DM.dll b/pdt_shureMXA_epi/bin/Debug/PepperDash_Essentials_DM.dll
diff --git a/pdt_shureMXA_epi/bin/Debug/SimplSharpData.dat b/pdt_shureMXA_epi/bin/Debug/SimplSharpData.dat
diff --git a/pdt_shureMXA_epi/bin/Debug/SimplSharpData.dat.der b/pdt_shureMXA_epi/bin/Debug/SimplSharpData.dat.der
diff --git a/pdt_shureMXA_epi/bin/Debug/SimplSharpNewtonsoft.dll b/pdt_shureMXA_epi/bin/Debug/SimplSharpNewtonsoft.dll
diff --git a/pdt_shureMXA_epi/bin/Debug/SimplSharpReflectionInterface.dll b/pdt_shureMXA_epi/bin/Debug/SimplSharpReflectionInterface.dll
diff --git a/pdt_shureMXA_epi/bin/Debug/SimplSharpSQLHelperInterface.dll b/pdt_shureMXA_epi/bin/Debug/SimplSharpSQLHelperInterface.dll
diff --git a/pdt_shureMXA_epi/bin/Debug/SimplSharpTimerEventInterface.dll b/pdt_shureMXA_epi/bin/Debug/SimplSharpTimerEventInterface.dll
diff --git a/pdt_shureMXA_epi/bin/Debug/manifest.info b/pdt_shureMXA_epi/bin/Debug/manifest.info
diff --git a/pdt_shureMXA_epi/bin/Debug/manifest.ser b/pdt_shureMXA_epi/bin/Debug/manifest.ser
diff --git a/pdt_shureMXA_epi/obj/Debug/ResolveAssemblyReference.cache b/pdt_shureMXA_epi/obj/Debug/ResolveAssemblyReference.cache
diff --git a/pdt_shureMXA_epi/obj/Debug/pdt_shureMXA_epi.csproj.FileListAbsolute.txt b/pdt_shureMXA_epi/obj/Debug/pdt_shureMXA_epi.csproj.FileListAbsolute.txt
diff --git a/pdt_shureMXA_epi/obj/Debug/pdt_shureMXA_epi.dll b/pdt_shureMXA_epi/obj/Debug/pdt_shureMXA_epi.dll
diff --git a/pdt_shureMXA_epi/obj/Debug/pdt_shureMXA_epi.pdb b/pdt_shureMXA_epi/obj/Debug/pdt_shureMXA_epi.pdb
diff --git a/pdt_shureMXA_epi/pdt_shureMXW_epi.csproj b/pdt_shureMXA_epi/pdt_shureMXW_epi.csproj
@@ -69,12 +69,12 @@
     </Reference>
     <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpHelperInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpNewtonsoft, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
@@ -83,7 +83,7 @@
     </Reference>
     <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">