Merge branch 'master' of https://github.com/mz-automation/lib60870.NET

mzillgith · mzillgith · commit 865c47c6aff7 · 2018-11-19T22:11:28.000+01:00
diff --git a/examples/cs101-master-balanced/cs101-master-balanced.csproj b/examples/cs101-master-balanced/cs101-master-balanced.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>cs101masterbalanced</RootNamespace>
     <AssemblyName>cs101-master-balanced</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs101-master-tcp/cs101-master-tcp.csproj b/examples/cs101-master-tcp/cs101-master-tcp.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>cs101mastertcp</RootNamespace>
     <AssemblyName>cs101-master-tcp</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs101-master-unbalanced/cs101-master-unbalanced.csproj b/examples/cs101-master-unbalanced/cs101-master-unbalanced.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>cs101_master_unbalanced</RootNamespace>
     <AssemblyName>cs101_master_unbalanced</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs101-slave-balanced/cs101-slave-balanced.csproj b/examples/cs101-slave-balanced/cs101-slave-balanced.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>cs101slavebalanced</RootNamespace>
     <AssemblyName>cs101-slave-balanced</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs101-slave-tcp/cs101-slave-tcp.csproj b/examples/cs101-slave-tcp/cs101-slave-tcp.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>cs101_slave_tcp</RootNamespace>
     <AssemblyName>cs101_slave_tcp</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs101-slave-unbalanced/cs101-slave-unbalanced.csproj b/examples/cs101-slave-unbalanced/cs101-slave-unbalanced.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>cs101slaveunbalanced</RootNamespace>
     <AssemblyName>cs101-slave-unbalanced</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs104-client1/cs104-client1.csproj b/examples/cs104-client1/cs104-client1.csproj
@@ -7,7 +7,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>testclient</RootNamespace>
     <AssemblyName>testclient</AssemblyName>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs104-client2/cs104-client2.csproj b/examples/cs104-client2/cs104-client2.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>testclient2</RootNamespace>
     <AssemblyName>testclient2</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs104-client3/cs104-client3.csproj b/examples/cs104-client3/cs104-client3.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>testclient3</RootNamespace>
     <AssemblyName>testclient3</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs104-multi-client-server/cs104-multi-client-server.csproj b/examples/cs104-multi-client-server/cs104-multi-client-server.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>multiclientserver</RootNamespace>
     <AssemblyName>multi-client-server</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs104-redundancy-server/cs104-redundancy-server.csproj b/examples/cs104-redundancy-server/cs104-redundancy-server.csproj
@@ -8,6 +8,7 @@
     <RootNamespace>cs104redundancyserver</RootNamespace>
     <AssemblyName>cs104-redundancy-server</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs104-server-file/cs104-server-file.csproj b/examples/cs104-server-file/cs104-server-file.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>cs104serverfile</RootNamespace>
     <AssemblyName>cs104-server-file</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs104-server/cs104-server.csproj b/examples/cs104-server/cs104-server.csproj
@@ -7,7 +7,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>testserver</RootNamespace>
     <AssemblyName>testserver</AssemblyName>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs104-server2/cs104-server2.csproj b/examples/cs104-server2/cs104-server2.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>slave1</RootNamespace>
     <AssemblyName>slave1</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs104-server3/cs104-server3.csproj b/examples/cs104-server3/cs104-server3.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>cs104server3</RootNamespace>
     <AssemblyName>cs104-server3</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs104-tls-client/cs104-tls-client.csproj b/examples/cs104-tls-client/cs104-tls-client.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>tlsclient</RootNamespace>
     <AssemblyName>tlsclient</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs104-tls-server/cs104-tls-server.csproj b/examples/cs104-tls-server/cs104-tls-server.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>tlsserver</RootNamespace>
     <AssemblyName>tlsserver</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/lib60870.NET.sln b/lib60870.NET.sln
@@ -173,7 +173,7 @@ Global
 		$7.inheritsSet = Mono
 		$7.inheritsScope = text/x-csharp
 		$7.scope = text/x-csharp
-		version = 2.1.0
+		version = 2.2.0
 		StartupItem = lib60870\lib60870.csproj
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
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/CS101Slave.cs b/lib60870/CS101/CS101Slave.cs
@@ -413,6 +413,7 @@ private bool HandleApplicationLayer(int address, byte[] msg, int userDataStart,
 						}
 					} else {
 						asdu.Cot = CauseOfTransmission.UNKNOWN_CAUSE_OF_TRANSMISSION;
+						asdu.IsNegative = true;
 						this.SendASDU (asdu);
 					}
 
@@ -432,6 +433,7 @@ private bool HandleApplicationLayer(int address, byte[] msg, int userDataStart,
 						}
 					} else {
 						asdu.Cot = CauseOfTransmission.UNKNOWN_CAUSE_OF_TRANSMISSION;
+						asdu.IsNegative = true;
 						this.SendASDU (asdu);
 					}
 
@@ -455,6 +457,7 @@ private bool HandleApplicationLayer(int address, byte[] msg, int userDataStart,
 
 					} else {
 						asdu.Cot = CauseOfTransmission.UNKNOWN_CAUSE_OF_TRANSMISSION;
+						asdu.IsNegative = true;
 						this.SendASDU (asdu);
 					}
 
@@ -477,6 +480,7 @@ private bool HandleApplicationLayer(int address, byte[] msg, int userDataStart,
 
 					} else {
 						asdu.Cot = CauseOfTransmission.UNKNOWN_CAUSE_OF_TRANSMISSION;
+						asdu.IsNegative = true;
 						this.SendASDU (asdu);
 					}
 
@@ -487,7 +491,10 @@ private bool HandleApplicationLayer(int address, byte[] msg, int userDataStart,
 					DebugLog("Rcvd test command C_TS_NA_1");
 
 					if (asdu.Cot != CauseOfTransmission.ACTIVATION)
+					{
 						asdu.Cot = CauseOfTransmission.UNKNOWN_CAUSE_OF_TRANSMISSION;
+						asdu.IsNegative = true;
+					}
 					else
 						asdu.Cot = CauseOfTransmission.ACTIVATION_CON;
 
@@ -514,6 +521,7 @@ private bool HandleApplicationLayer(int address, byte[] msg, int userDataStart,
 
 					} else {
 						asdu.Cot = CauseOfTransmission.UNKNOWN_CAUSE_OF_TRANSMISSION;
+						asdu.IsNegative = true;
 						this.SendASDU (asdu);
 					}
 
@@ -535,6 +543,7 @@ private bool HandleApplicationLayer(int address, byte[] msg, int userDataStart,
 						}
 					} else {
 						asdu.Cot = CauseOfTransmission.UNKNOWN_CAUSE_OF_TRANSMISSION;
+						asdu.IsNegative = true;
 						this.SendASDU (asdu);
 					}
 
@@ -551,6 +560,7 @@ private bool HandleApplicationLayer(int address, byte[] msg, int userDataStart,
 
 				if (messageHandled == false) {
 					asdu.Cot = CauseOfTransmission.UNKNOWN_TYPE_ID;
+					asdu.IsNegative = true;
 					this.SendASDU (asdu);
 				}
 
diff --git a/lib60870/CS101/ParameterMeasuredValues.cs b/lib60870/CS101/ParameterMeasuredValues.cs
@@ -154,7 +154,7 @@ public ScaledValue ScaledValue {
 
 		private byte qpm;
 
-		public float QPM {
+		public byte QPM {
 			get {
 				return qpm;
 			}
@@ -220,7 +220,7 @@ public float Value {
 
 		private byte qpm;
 
-		public float QPM {
+		public byte QPM {
 			get {
 				return qpm;
 			}
diff --git a/lib60870/CS104/ClientConnection.cs b/lib60870/CS104/ClientConnection.cs
diff --git a/lib60870/CS104/Connection.cs b/lib60870/CS104/Connection.cs
diff --git a/lib60870/CS104/Server.cs b/lib60870/CS104/Server.cs
diff --git a/lib60870/lib60870.csproj b/lib60870/lib60870.csproj
diff --git a/tests/lib60870-tests.csproj b/tests/lib60870-tests.csproj
