Added auto register reset to default typed value on disconnect

OpenLogics · Oct 21, 2022 · 43c7f72 · 43c7f72
1 parent 2e35ed8
commit 43c7f72
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 3 deletions.
diff --git a/Examples/Program.cs b/Examples/Program.cs
@@ -34,7 +34,7 @@ static void Scenario1 () {
         Task.Factory.StartNew(async () => {
 
             //attaching the logger
-            Logger.LogLevel = LogLevel.Critical;
+            Logger.LogLevel = LogLevel.Verbose;
             Logger.OnNewLogMessage((date, msg) => {
                 Console.WriteLine($"{date.ToString("HH:mm:ss")} {msg}");
             });
@@ -50,6 +50,7 @@ static void Scenario1 () {
                 while (true) {
                     if (isProgressReadout) continue;
                     Console.Title = $"Polling Paused: {interf.PollingPaused}, " +
+                    $"Poller active: {interf.PollerActive}, " +
                     $"Speed UP: {interf.BytesPerSecondUpstream} B/s, " +
                     $"Speed DOWN: {interf.BytesPerSecondDownstream} B/s, " +
                     $"Poll delay: {interf.PollerDelayMs} ms, " +
@@ -58,7 +59,21 @@ static void Scenario1 () {
                 }
             });
 
-            await interf.ConnectAsync((plcinf) => AfterConnect(interf, registers));
+            //await interf.ConnectAsync((plcinf) => AfterConnect(interf, registers));
+
+            bool flip = false;
+            while(true) {
+
+                if(!flip) {
+                    await interf.ConnectAsync();
+                } else {
+                    interf.Disconnect();
+                }
+
+                flip = !flip;
+                await Task.Delay(5000);
+
+            }
 
         });
 

diff --git a/MewtocolNet/Mewtocol/DynamicInterface.cs b/MewtocolNet/Mewtocol/DynamicInterface.cs
@@ -19,11 +19,17 @@ public partial class MewtocolInterface {
         /// </summary>
         public bool PollingPaused => pollerIsPaused;
 
+        /// <summary>
+        /// True if the poller is actvice (can be paused)
+        /// </summary>
+        public bool PollerActive => !pollerTaskStopped;
+
         internal event Action PolledCycle;
 
         internal volatile bool pollerTaskRunning;
         internal volatile bool pollerTaskStopped;
         internal volatile bool pollerIsPaused;
+        internal volatile bool pollerFirstCycle = false;
 
         internal bool usePoller = false;
 
@@ -37,6 +43,8 @@ internal void KillPoller () {
             pollerTaskRunning = false;
             pollerTaskStopped = true;
 
+            ClearRegisterVals();
+
         }
 
         /// <summary>
@@ -80,6 +88,8 @@ internal void AttachPoller () {
             if (pollerTaskRunning)
                 return;
 
+            pollerFirstCycle = true;
+
             Task.Factory.StartNew(async () => {
 
                 Logger.Log("Poller is attaching", LogLevel.Info, this);
@@ -167,6 +177,7 @@ internal void AttachPoller () {
                         }
 
                         iteration++;
+                        pollerFirstCycle = false;
 
                         await Task.Delay(pollerDelayMs);
 

diff --git a/MewtocolNet/Mewtocol/MewtocolInterface.cs b/MewtocolNet/Mewtocol/MewtocolInterface.cs
@@ -395,6 +395,17 @@ private void OnMajorSocketExceptionWhileConnected () {
 
         }
 
+        private void ClearRegisterVals () {
+
+            for (int i = 0; i < Registers.Count; i++) {
+
+                var reg = Registers[i];
+                reg.ClearValue();
+
+            }
+
+        }
+
         #endregion
 
         #region Register Collection

diff --git a/MewtocolNet/Mewtocol/Subregisters/Register.cs b/MewtocolNet/Mewtocol/Subregisters/Register.cs
@@ -94,6 +94,38 @@ internal void TriggerNotifyChange () {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("Value"));
         }
 
+        internal void ClearValue () {
+
+            if (enumType != null && this is NRegister<int> intEnumReg) {
+                intEnumReg.SetValueFromPLC((int)0);
+            }
+            if (this is NRegister<short> shortReg) {
+                shortReg.SetValueFromPLC((short)0);
+            }
+            if (this is NRegister<ushort> ushortReg) {
+                ushortReg.SetValueFromPLC((ushort)0);
+            }
+            if (this is NRegister<int> intReg) {
+                intReg.SetValueFromPLC((int)0);
+            }
+            if (this is NRegister<uint> uintReg) {
+                uintReg.SetValueFromPLC((uint)0);
+            }
+            if (this is NRegister<float> floatReg) {
+                floatReg.SetValueFromPLC((float)0);
+            }
+            if (this is NRegister<TimeSpan> tsReg) {
+                tsReg.SetValueFromPLC(TimeSpan.Zero);
+            }
+            if (this is BRegister boolReg) {
+                boolReg.SetValueFromPLC(false);
+            }
+            if (this is SRegister stringReg) {
+                stringReg.SetValueFromPLC(null);
+            }
+
+        }
+
         /// <summary>
         /// Gets the starting memory are either numeric or A,B,C,D etc for special areas like inputs
         /// </summary>

diff --git a/MewtocolNet/MewtocolNet.csproj b/MewtocolNet/MewtocolNet.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageId>Mewtocol.NET</PackageId>
-    <Version>0.6.1</Version>
+    <Version>0.6.2</Version>
     <Authors>Felix Weiss</Authors>
     <Company>Womed</Company>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>