- added error handling on CP56Time2A.GetDateTime function

- fixed wrong return type for parameter qualifier in pParameter information objects
mz-automation · Nov 13, 2018 · 8b0ee79 · 8b0ee79
1 parent d83d26d
commit 8b0ee79
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/lib60870/CP56Time2a.cs b/lib60870/CP56Time2a.cs
@@ -65,8 +65,27 @@ public DateTime GetDateTime(int startYear)
 			if (this.Year < (startYear % 100))
 				baseYear += 100;
 
-			DateTime value = new DateTime (baseYear + this.Year, this.Month, this.DayOfMonth, this.Hour, this.Minute, this.Second, this.Millisecond);
-
+            int month = this.Month;
+
+            if (month == 0)
+                month = 1;
+
+            int dayOfMonth = this.DayOfMonth;
+
+            if (dayOfMonth == 0)
+                dayOfMonth = 1;
+
+            DateTime value;
+
+            try
+            {
+                value = new DateTime(baseYear + this.Year, month, dayOfMonth, this.Hour, this.Minute, this.Second, this.Millisecond);
+            }
+            catch (ArgumentOutOfRangeException)
+            {
+                value = new DateTime(0);
+            }
+
 			return value;
 		}
 

diff --git a/lib60870/CS101/ParameterMeasuredValues.cs b/lib60870/CS101/ParameterMeasuredValues.cs
@@ -154,7 +154,7 @@ public class ParameterScaledValue : InformationObject
 
 		private byte qpm;
 
-		public float QPM {
+		public byte QPM {
 			get {
 				return qpm;
 			}
@@ -220,7 +220,7 @@ public class ParameterFloatValue : InformationObject
 
 		private byte qpm;
 
-		public float QPM {
+		public byte QPM {
 			get {
 				return qpm;
 			}

diff --git a/lib60870/CS104/Connection.cs b/lib60870/CS104/Connection.cs
@@ -1676,7 +1676,7 @@ private void HandleConnection()
                                 }
 
                                 if (suspendThread)
-                                    Thread.Sleep(10);
+                                    Thread.Sleep(1);
 
                             }
                             catch (SocketException)