diff --git a/ConsoleApplication1/ConsoleApplication1.csproj b/ConsoleApplication1/ConsoleApplication1.csproj index 186a0e3..3afd728 100644 --- a/ConsoleApplication1/ConsoleApplication1.csproj +++ b/ConsoleApplication1/ConsoleApplication1.csproj @@ -1,64 +1,29 @@ - - - + - Debug - AnyCPU - {AA208FA1-1496-4BBC-97D1-9F628EB4197A} Exe - Properties - ConsoleApplication1 - ConsoleApplication1 - v4.5.2 - 512 + net5.0 true + ConsoleApplication1 + ConsoleApplication1 + Copyright © 2017 + bin\$(Configuration)\ - AnyCPU - true full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AnyCPU pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - ..\packages\EasyModbusTCP.4.5.1\lib\EasyModbus.dll - - - - - - - - - + + - - + - - + + ..\..\..\..\..\..\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\5.0.0-preview.6.20308.1\ref\net5.0\System.Resources.Extensions.dll + - - \ No newline at end of file diff --git a/ConsoleApplication1/Program.cs b/ConsoleApplication1/Program.cs index be11d02..eeba1da 100644 --- a/ConsoleApplication1/Program.cs +++ b/ConsoleApplication1/Program.cs @@ -1,14 +1,9 @@ - using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; + using System; -using System.Net.Sockets; -using System.Net; -using System.IO.Ports; -using System.Reflection; + namespace ConsoleApplication1 + + { class Program { diff --git a/ConsoleApplication1/Properties/AssemblyInfo.cs b/ConsoleApplication1/Properties/AssemblyInfo.cs index 97e457c..dc94290 100644 --- a/ConsoleApplication1/Properties/AssemblyInfo.cs +++ b/ConsoleApplication1/Properties/AssemblyInfo.cs @@ -2,18 +2,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("ConsoleApplication1")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ConsoleApplication1")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. @@ -21,16 +9,3 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("aa208fa1-1496-4bbc-97d1-9f628eb4197a")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/ConsoleApplication1/packages.config b/ConsoleApplication1/packages.config deleted file mode 100644 index 9b07e13..0000000 --- a/ConsoleApplication1/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/EasyModbus.sln b/EasyModbus.sln index a5b3acb..d27c7bf 100644 --- a/EasyModbus.sln +++ b/EasyModbus.sln @@ -3,21 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29503.13 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyModbus", "EasyModbus\EasyModbus.csproj", "{7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyModbus", "EasyModbus\EasyModbus.csproj", "{7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyModbusServerSimulator", "EasyModbusServerSimulator\EasyModbusServerSimulator.csproj", "{871BD4C1-69F0-45B9-8807-1620E6A896A9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyModbusServerSimulator", "EasyModbusServerSimulator\EasyModbusServerSimulator.csproj", "{871BD4C1-69F0-45B9-8807-1620E6A896A9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyModbusClientExample", "EasyModbusClientExample\EasyModbusClientExample.csproj", "{9412077F-7DFF-45D0-AFF9-7D5303118EA7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyModbusClientExample", "EasyModbusClientExample\EasyModbusClientExample.csproj", "{9412077F-7DFF-45D0-AFF9-7D5303118EA7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyModbusAdvancedClient", "EasyModbusAdvancedClient\EasyModbusAdvancedClient.csproj", "{3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyModbusAdvancedClient", "EasyModbusAdvancedClient\EasyModbusAdvancedClient.csproj", "{3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerApplication", "ServerApplication\ServerApplication.csproj", "{F737B6B0-3B35-4CC9-9134-EFF5F37B8C1F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerApplication", "ServerApplication\ServerApplication.csproj", "{F737B6B0-3B35-4CC9-9134-EFF5F37B8C1F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyModbusTCPCore", "EasyModbusTCPCore\EasyModbusTCPCore.csproj", "{22675733-2164-4AE8-A8C2-F23182073913}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyModbusClient_IOTCoreExample", "EasyModbusClient_IOTCoreExample\EasyModbusClient_IOTCoreExample.csproj", "{9AC81F46-F110-46F3-B884-6665D8A05267}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApplication1", "ConsoleApplication1\ConsoleApplication1.csproj", "{AA208FA1-1496-4BBC-97D1-9F628EB4197A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApplication1", "ConsoleApplication1\ConsoleApplication1.csproj", "{AA208FA1-1496-4BBC-97D1-9F628EB4197A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -55,38 +53,38 @@ Global {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.Debug|x64.Build.0 = Debug|Any CPU {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.Debug|x86.ActiveCfg = Debug|Any CPU {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.Debug|x86.Build.0 = Debug|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|Any CPU.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|Any CPU.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|ARM.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|ARM.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|x64.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|x64.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|x86.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|x86.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|Any CPU.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|Any CPU.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|ARM.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|ARM.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|x64.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|x64.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|x86.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|x86.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|Any CPU.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|Any CPU.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|ARM.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|ARM.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|x64.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|x64.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|x86.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|x86.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|Any CPU.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|Any CPU.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|ARM.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|ARM.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|x64.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|x64.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|x86.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|x86.Build.0 = DebugCommercial|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|Any CPU.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|Any CPU.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|ARM.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|ARM.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|x64.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|x64.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|x86.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|x86.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|Any CPU.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|Any CPU.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|ARM.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|ARM.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|x64.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|x64.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|x86.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|x86.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|Any CPU.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|Any CPU.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|ARM.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|ARM.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|x64.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|x64.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|x86.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|x86.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|Any CPU.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|Any CPU.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|ARM.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|ARM.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|x64.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|x64.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|x86.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|x86.Build.0 = Debug|Any CPU {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.Release|Any CPU.ActiveCfg = Release|Any CPU {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.Release|Any CPU.Build.0 = Release|Any CPU {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.Release|ARM.ActiveCfg = Release|Any CPU @@ -103,38 +101,38 @@ Global {871BD4C1-69F0-45B9-8807-1620E6A896A9}.Debug|x64.Build.0 = Debug|Any CPU {871BD4C1-69F0-45B9-8807-1620E6A896A9}.Debug|x86.ActiveCfg = Debug|Any CPU {871BD4C1-69F0-45B9-8807-1620E6A896A9}.Debug|x86.Build.0 = Debug|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|Any CPU.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|Any CPU.Build.0 = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|ARM.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|ARM.Build.0 = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|x64.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|x64.Build.0 = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|x86.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|x86.Build.0 = DebugCommercial3|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|Any CPU.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|Any CPU.Build.0 = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|ARM.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|ARM.Build.0 = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|x64.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|x64.Build.0 = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|x86.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|x86.Build.0 = Debug|Any CPU {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|Any CPU.ActiveCfg = Debug|Any CPU {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|Any CPU.Build.0 = Debug|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|ARM.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|ARM.Build.0 = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|x64.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|x64.Build.0 = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|x86.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|x86.Build.0 = DebugCommercial3|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|ARM.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|ARM.Build.0 = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|x64.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|x64.Build.0 = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|x86.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|x86.Build.0 = Debug|Any CPU {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|Any CPU.ActiveCfg = Debug|Any CPU {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|Any CPU.Build.0 = Debug|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|ARM.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|ARM.Build.0 = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|x64.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|x64.Build.0 = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|x86.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|x86.Build.0 = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|Any CPU.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|Any CPU.Build.0 = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|ARM.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|ARM.Build.0 = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|x64.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|x64.Build.0 = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|x86.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|x86.Build.0 = DebugCommercial3|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|ARM.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|ARM.Build.0 = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|x64.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|x64.Build.0 = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|x86.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|x86.Build.0 = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|Any CPU.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|Any CPU.Build.0 = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|ARM.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|ARM.Build.0 = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|x64.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|x64.Build.0 = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|x86.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|x86.Build.0 = Debug|Any CPU {871BD4C1-69F0-45B9-8807-1620E6A896A9}.Release|Any CPU.ActiveCfg = Release|Any CPU {871BD4C1-69F0-45B9-8807-1620E6A896A9}.Release|Any CPU.Build.0 = Release|Any CPU {871BD4C1-69F0-45B9-8807-1620E6A896A9}.Release|ARM.ActiveCfg = Release|Any CPU @@ -151,38 +149,38 @@ Global {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.Debug|x64.Build.0 = Debug|Any CPU {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.Debug|x86.ActiveCfg = Debug|Any CPU {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.Debug|x86.Build.0 = Debug|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|Any CPU.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|Any CPU.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|ARM.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|ARM.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|x64.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|x64.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|x86.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|x86.Build.0 = DebugCommercial2|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|Any CPU.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|Any CPU.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|ARM.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|ARM.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|x64.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|x64.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|x86.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|x86.Build.0 = Debug|Any CPU {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|Any CPU.ActiveCfg = Debug|Any CPU {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|Any CPU.Build.0 = Debug|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|ARM.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|ARM.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|x64.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|x64.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|x86.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|x86.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|Any CPU.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|Any CPU.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|ARM.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|ARM.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|x64.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|x64.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|x86.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|x86.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|Any CPU.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|Any CPU.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|ARM.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|ARM.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|x64.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|x64.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|x86.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|x86.Build.0 = DebugCommercial2|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|ARM.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|ARM.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|x64.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|x64.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|x86.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|x86.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|Any CPU.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|Any CPU.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|ARM.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|ARM.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|x64.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|x64.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|x86.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|x86.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|Any CPU.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|Any CPU.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|ARM.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|ARM.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|x64.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|x64.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|x86.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|x86.Build.0 = Debug|Any CPU {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.Release|Any CPU.ActiveCfg = Release|Any CPU {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.Release|Any CPU.Build.0 = Release|Any CPU {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.Release|ARM.ActiveCfg = Release|Any CPU @@ -199,38 +197,38 @@ Global {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.Debug|x64.Build.0 = Debug|Any CPU {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.Debug|x86.ActiveCfg = Debug|Any CPU {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.Debug|x86.Build.0 = Debug|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|Any CPU.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|Any CPU.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|ARM.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|ARM.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|x64.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|x64.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|x86.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|x86.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|Any CPU.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|Any CPU.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|ARM.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|ARM.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|x64.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|x64.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|x86.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|x86.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|Any CPU.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|Any CPU.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|ARM.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|ARM.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|x64.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|x64.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|x86.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|x86.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|Any CPU.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|Any CPU.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|ARM.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|ARM.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|x64.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|x64.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|x86.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|x86.Build.0 = DebugCommercial1|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|Any CPU.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|Any CPU.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|ARM.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|ARM.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|x64.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|x64.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|x86.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|x86.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|Any CPU.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|Any CPU.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|ARM.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|ARM.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|x64.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|x64.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|x86.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|x86.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|Any CPU.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|Any CPU.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|ARM.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|ARM.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|x64.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|x64.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|x86.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|x86.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|Any CPU.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|Any CPU.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|ARM.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|ARM.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|x64.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|x64.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|x86.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|x86.Build.0 = Debug|Any CPU {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.Release|Any CPU.ActiveCfg = Release|Any CPU {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.Release|Any CPU.Build.0 = Release|Any CPU {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.Release|ARM.ActiveCfg = Release|Any CPU @@ -335,77 +333,6 @@ Global {22675733-2164-4AE8-A8C2-F23182073913}.Release|x64.Build.0 = Release|Any CPU {22675733-2164-4AE8-A8C2-F23182073913}.Release|x86.ActiveCfg = Release|Any CPU {22675733-2164-4AE8-A8C2-F23182073913}.Release|x86.Build.0 = Release|Any CPU - {9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|Any CPU.ActiveCfg = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|Any CPU.Build.0 = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|ARM.ActiveCfg = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|ARM.Build.0 = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|ARM.Deploy.0 = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|x64.ActiveCfg = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|x64.Build.0 = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|x64.Deploy.0 = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|x86.ActiveCfg = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|x86.Build.0 = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|x86.Deploy.0 = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial|Any CPU.ActiveCfg = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial|Any CPU.Build.0 = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial|Any CPU.Deploy.0 = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial|ARM.ActiveCfg = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial|ARM.Build.0 = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial|ARM.Deploy.0 = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial|x64.ActiveCfg = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial|x64.Build.0 = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial|x64.Deploy.0 = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial|x86.ActiveCfg = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial|x86.Build.0 = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial|x86.Deploy.0 = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial1|Any CPU.ActiveCfg = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial1|Any CPU.Build.0 = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial1|Any CPU.Deploy.0 = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial1|ARM.ActiveCfg = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial1|ARM.Build.0 = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial1|ARM.Deploy.0 = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial1|x64.ActiveCfg = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial1|x64.Build.0 = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial1|x64.Deploy.0 = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial1|x86.ActiveCfg = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial1|x86.Build.0 = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial1|x86.Deploy.0 = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial2|Any CPU.ActiveCfg = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial2|Any CPU.Build.0 = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial2|Any CPU.Deploy.0 = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial2|ARM.ActiveCfg = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial2|ARM.Build.0 = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial2|ARM.Deploy.0 = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial2|x64.ActiveCfg = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial2|x64.Build.0 = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial2|x64.Deploy.0 = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial2|x86.ActiveCfg = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial2|x86.Build.0 = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial2|x86.Deploy.0 = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial3|Any CPU.ActiveCfg = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial3|Any CPU.Build.0 = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial3|Any CPU.Deploy.0 = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial3|ARM.ActiveCfg = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial3|ARM.Build.0 = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial3|ARM.Deploy.0 = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial3|x64.ActiveCfg = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial3|x64.Build.0 = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial3|x64.Deploy.0 = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial3|x86.ActiveCfg = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial3|x86.Build.0 = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial3|x86.Deploy.0 = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Release|Any CPU.ActiveCfg = Release|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.Release|Any CPU.Build.0 = Release|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.Release|Any CPU.Deploy.0 = Release|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.Release|ARM.ActiveCfg = Release|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.Release|ARM.Build.0 = Release|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.Release|ARM.Deploy.0 = Release|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.Release|x64.ActiveCfg = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Release|x64.Build.0 = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Release|x64.Deploy.0 = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Release|x86.ActiveCfg = Release|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Release|x86.Build.0 = Release|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Release|x86.Deploy.0 = Release|x86 {AA208FA1-1496-4BBC-97D1-9F628EB4197A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AA208FA1-1496-4BBC-97D1-9F628EB4197A}.Debug|Any CPU.Build.0 = Debug|Any CPU {AA208FA1-1496-4BBC-97D1-9F628EB4197A}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -459,7 +386,7 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - VisualSVNWorkingCopyRoot = . SolutionGuid = {7628B1C9-8DDB-4DBD-A71D-D369A4A166DE} + VisualSVNWorkingCopyRoot = . EndGlobalSection EndGlobal diff --git a/EasyModbus/EasyModbus.csproj b/EasyModbus/EasyModbus.csproj index 41db91d..2f6c0df 100644 --- a/EasyModbus/EasyModbus.csproj +++ b/EasyModbus/EasyModbus.csproj @@ -1,81 +1,39 @@ - - + - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B} - Debug - AnyCPU - Library - EasyModbus - EasyModbus - v4.0 - - - Properties - - - - - 3.5 - - - AnyCPU + net5.0 + + + EasyModbus + Stefan Rossmann Engineering Solutions + EasyModbus + Copyright 2017-2020 + 5.5.2 + 5.5.2 - bin\Debug\ - True + bin\$(Configuration)\ Full - False True - DEBUG;TRACE - bin\Release\ - False + bin\$(Configuration)\ None - True - False - TRACE true - bin\DebugCommercial\ + bin\$(Configuration)\ TRACE;DEBUG;COMMERCIAL true Full - AnyCPU MinimumRecommendedRules.ruleset - false TRACE;DEBUG;SSL - false 0 - bin\Debug\EasyModbus.xml - - - false + bin\$(Configuration)\EasyModbus.xml - - - - 3.5 - - - - 3.5 - - - - - - - - - - - - + + - \ No newline at end of file diff --git a/EasyModbus/ModbusClient.cs b/EasyModbus/ModbusClient.cs index c1e8f38..e686cdc 100644 --- a/EasyModbus/ModbusClient.cs +++ b/EasyModbus/ModbusClient.cs @@ -24,10 +24,8 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. using System; using System.Net.Sockets; using System.Net; -using System.IO.Ports; using System.Reflection; -using System.Text; -using System.Collections.Generic; +using System.IO.Ports; namespace EasyModbus { @@ -717,8 +715,8 @@ public static UInt16 calculateCRC(byte[] data, UInt16 numberOfBytes, int startBy private bool receiveActive = false; private byte[] readBuffer = new byte[256]; private int bytesToRead = 0; - private int akjjjctualPositionToRead = 0; - DateTime dateTimeLastRead; + /*private int akjjjctualPositionToRead = 0; + DateTime dateTimeLastRead;*/ /* private void DataReceivedHandler(object sender, SerialDataReceivedEventArgs e) @@ -873,17 +871,17 @@ public bool[] ReadDiscreteInputs(int startingAddress, int quantity) if (serialport != null) if (!serialport.IsOpen) { - if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.SerialPortNotOpenedException("serial port not opened"); } if (tcpClient == null & !udpFlag & serialport==null) { - if (debug) StoreLogData.Instance.Store("ConnectionException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ConnectionException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ConnectionException("connection error"); } if (startingAddress > 65535 | quantity >2000) { - if (debug) StoreLogData.Instance.Store("ArgumentException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ArgumentException Thrown", System.DateTime.Now); throw new ArgumentException("Starting address must be 0 - 65535; quantity must be 0 - 2000"); } bool[] response; @@ -995,22 +993,22 @@ public bool[] ReadDiscreteInputs(int startingAddress, int quantity) } if (data[7] == 0x82 & data[8] == 0x01) { - if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.FunctionCodeNotSupportedException("Function code not supported by master"); } if (data[7] == 0x82 & data[8] == 0x02) { - if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.StartingAddressInvalidException("Starting address invalid or starting address + quantity invalid"); } if (data[7] == 0x82 & data[8] == 0x03) { - if (debug) StoreLogData.Instance.Store("QuantityInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("QuantityInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.QuantityInvalidException("quantity invalid"); } if (data[7] == 0x82 & data[8] == 0x04) { - if (debug) StoreLogData.Instance.Store("ModbusException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ModbusException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ModbusException("error reading"); } if (serialport != null) @@ -1018,7 +1016,7 @@ public bool[] ReadDiscreteInputs(int startingAddress, int quantity) crc = BitConverter.GetBytes(calculateCRC(data, (ushort)(data[8]+3), 6)); if ((crc[0] != data[data[8] + 9] | crc[1] != data[data[8] + 10]) & dataReceived) { - if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -1032,7 +1030,7 @@ public bool[] ReadDiscreteInputs(int startingAddress, int quantity) } else if (!dataReceived) { - if (debug) StoreLogData.Instance.Store("TimeoutException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("TimeoutException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -1069,17 +1067,17 @@ public bool[] ReadCoils(int startingAddress, int quantity) if (serialport != null) if (!serialport.IsOpen) { - if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.SerialPortNotOpenedException("serial port not opened"); } if (tcpClient == null & !udpFlag & serialport == null) { - if (debug) StoreLogData.Instance.Store("ConnectionException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ConnectionException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ConnectionException("connection error"); } if (startingAddress > 65535 | quantity >2000) { - if (debug) StoreLogData.Instance.Store("ArgumentException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ArgumentException Thrown", System.DateTime.Now); throw new ArgumentException("Starting address must be 0 - 65535; quantity must be 0 - 2000"); } bool[] response; @@ -1190,22 +1188,22 @@ public bool[] ReadCoils(int startingAddress, int quantity) } if (data[7] == 0x81 & data[8] == 0x01) { - if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.FunctionCodeNotSupportedException("Function code not supported by master"); } if (data[7] == 0x81 & data[8] == 0x02) { - if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.StartingAddressInvalidException("Starting address invalid or starting address + quantity invalid"); } if (data[7] == 0x81 & data[8] == 0x03) { - if (debug) StoreLogData.Instance.Store("QuantityInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("QuantityInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.QuantityInvalidException("quantity invalid"); } if (data[7] == 0x81 & data[8] == 0x04) { - if (debug) StoreLogData.Instance.Store("ModbusException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ModbusException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ModbusException("error reading"); } if (serialport != null) @@ -1213,7 +1211,7 @@ public bool[] ReadCoils(int startingAddress, int quantity) crc = BitConverter.GetBytes(calculateCRC(data, (ushort)(data[8]+3), 6)); if ((crc[0] != data[data[8]+9] | crc[1] != data[data[8]+10]) & dataReceived) { - if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -1227,7 +1225,7 @@ public bool[] ReadCoils(int startingAddress, int quantity) } else if (!dataReceived) { - if (debug) StoreLogData.Instance.Store("TimeoutException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("TimeoutException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -1264,17 +1262,17 @@ public int[] ReadHoldingRegisters(int startingAddress, int quantity) if (serialport != null) if (!serialport.IsOpen) { - if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.SerialPortNotOpenedException("serial port not opened"); } if (tcpClient == null & !udpFlag & serialport == null) { - if (debug) StoreLogData.Instance.Store("ConnectionException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ConnectionException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ConnectionException("connection error"); } if (startingAddress > 65535 | quantity >125) { - if (debug) StoreLogData.Instance.Store("ArgumentException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ArgumentException Thrown", System.DateTime.Now); throw new ArgumentException("Starting address must be 0 - 65535; quantity must be 0 - 125"); } int[] response; @@ -1381,22 +1379,22 @@ public int[] ReadHoldingRegisters(int startingAddress, int quantity) } if (data[7] == 0x83 & data[8] == 0x01) { - if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.FunctionCodeNotSupportedException("Function code not supported by master"); } if (data[7] == 0x83 & data[8] == 0x02) { - if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.StartingAddressInvalidException("Starting address invalid or starting address + quantity invalid"); } if (data[7] == 0x83 & data[8] == 0x03) { - if (debug) StoreLogData.Instance.Store("QuantityInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("QuantityInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.QuantityInvalidException("quantity invalid"); } if (data[7] == 0x83 & data[8] == 0x04) { - if (debug) StoreLogData.Instance.Store("ModbusException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ModbusException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ModbusException("error reading"); } if (serialport != null) @@ -1404,7 +1402,7 @@ public int[] ReadHoldingRegisters(int startingAddress, int quantity) crc = BitConverter.GetBytes(calculateCRC(data, (ushort)(data[8]+3), 6)); if ((crc[0] != data[data[8]+9] | crc[1] != data[data[8]+10])& dataReceived) { - if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -1418,7 +1416,7 @@ public int[] ReadHoldingRegisters(int startingAddress, int quantity) } else if (!dataReceived) { - if (debug) StoreLogData.Instance.Store("TimeoutException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("TimeoutException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -1465,17 +1463,17 @@ public int[] ReadInputRegisters(int startingAddress, int quantity) if (serialport != null) if (!serialport.IsOpen) { - if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.SerialPortNotOpenedException("serial port not opened"); } if (tcpClient == null & !udpFlag & serialport == null) { - if (debug) StoreLogData.Instance.Store("ConnectionException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ConnectionException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ConnectionException("connection error"); } if (startingAddress > 65535 | quantity >125) { - if (debug) StoreLogData.Instance.Store("ArgumentException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ArgumentException Thrown", System.DateTime.Now); throw new ArgumentException("Starting address must be 0 - 65535; quantity must be 0 - 125"); } int[] response; @@ -1584,22 +1582,22 @@ public int[] ReadInputRegisters(int startingAddress, int quantity) } if (data[7] == 0x84 & data[8] == 0x01) { - if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.FunctionCodeNotSupportedException("Function code not supported by master"); } if (data[7] == 0x84 & data[8] == 0x02) { - if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.StartingAddressInvalidException("Starting address invalid or starting address + quantity invalid"); } if (data[7] == 0x84 & data[8] == 0x03) { - if (debug) StoreLogData.Instance.Store("QuantityInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("QuantityInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.QuantityInvalidException("quantity invalid"); } if (data[7] == 0x84 & data[8] == 0x04) { - if (debug) StoreLogData.Instance.Store("ModbusException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ModbusException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ModbusException("error reading"); } if (serialport != null) @@ -1607,7 +1605,7 @@ public int[] ReadInputRegisters(int startingAddress, int quantity) crc = BitConverter.GetBytes(calculateCRC(data, (ushort)(data[8]+3), 6)); if ((crc[0] != data[data[8]+9] | crc[1] != data[data[8]+10]) & dataReceived) { - if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -1621,7 +1619,7 @@ public int[] ReadInputRegisters(int startingAddress, int quantity) } else if (!dataReceived) { - if (debug) StoreLogData.Instance.Store("TimeoutException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("TimeoutException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -1666,12 +1664,12 @@ public void WriteSingleCoil(int startingAddress, bool value) if (serialport != null) if (!serialport.IsOpen) { - if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.SerialPortNotOpenedException("serial port not opened"); } if (tcpClient == null & !udpFlag & serialport == null) { - if (debug) StoreLogData.Instance.Store("ConnectionException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ConnectionException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ConnectionException("connection error"); } byte[] coilValue = new byte[2]; @@ -1729,7 +1727,7 @@ public void WriteSingleCoil(int startingAddress, bool value) readBuffer = new byte[256]; DateTime dateTimeSend = DateTime.Now; byte receivedUnitIdentifier = 0xFF; - while (receivedUnitIdentifier != this.unitIdentifier & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout)) + while (this.unitIdentifier != 0 & receivedUnitIdentifier != this.unitIdentifier & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout)) { while (dataReceived == false & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout)) System.Threading.Thread.Sleep(1); @@ -1785,30 +1783,30 @@ public void WriteSingleCoil(int startingAddress, bool value) } if (data[7] == 0x85 & data[8] == 0x01) { - if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.FunctionCodeNotSupportedException("Function code not supported by master"); } if (data[7] == 0x85 & data[8] == 0x02) { - if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.StartingAddressInvalidException("Starting address invalid or starting address + quantity invalid"); } if (data[7] == 0x85 & data[8] == 0x03) { - if (debug) StoreLogData.Instance.Store("QuantityInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("QuantityInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.QuantityInvalidException("quantity invalid"); } if (data[7] == 0x85 & data[8] == 0x04) { - if (debug) StoreLogData.Instance.Store("ModbusException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ModbusException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ModbusException("error reading"); } if (serialport != null) { crc = BitConverter.GetBytes(calculateCRC(data, 6, 6)); - if ((crc[0] != data[12] | crc[1] != data[13]) & dataReceived) - { - if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Throwed", System.DateTime.Now); + if ((crc[0] != data[12] | crc[1] != data[13]) & dataReceived) + { + if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -1820,10 +1818,10 @@ public void WriteSingleCoil(int startingAddress, bool value) WriteSingleCoil(startingAddress, value); } } - else if (!dataReceived) - { - if (debug) StoreLogData.Instance.Store("TimeoutException Throwed", System.DateTime.Now); - if (NumberOfRetries <= countRetries) + else if (!dataReceived & this.unitIdentifier != 0) + { + if (debug) StoreLogData.Instance.Store("TimeoutException Thrown", System.DateTime.Now); + if (NumberOfRetries <= countRetries ) { countRetries = 0; throw new TimeoutException("No Response from Modbus Slave"); @@ -1851,12 +1849,12 @@ public void WriteSingleRegister(int startingAddress, int value) if (serialport != null) if (!serialport.IsOpen) { - if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.SerialPortNotOpenedException("serial port not opened"); } if (tcpClient == null & !udpFlag & serialport == null) { - if (debug) StoreLogData.Instance.Store("ConnectionException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ConnectionException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ConnectionException("connection error"); } byte[] registerValue = new byte[2]; @@ -1908,7 +1906,7 @@ public void WriteSingleRegister(int startingAddress, int value) readBuffer = new byte[256]; DateTime dateTimeSend = DateTime.Now; byte receivedUnitIdentifier = 0xFF; - while (receivedUnitIdentifier != this.unitIdentifier & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout)) + while (this.unitIdentifier != 0 & receivedUnitIdentifier != this.unitIdentifier & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout)) { while (dataReceived == false & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout)) System.Threading.Thread.Sleep(1); @@ -1962,34 +1960,34 @@ public void WriteSingleRegister(int startingAddress, int value) } if (data[7] == 0x86 & data[8] == 0x01) { - if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.FunctionCodeNotSupportedException("Function code not supported by master"); } if (data[7] == 0x86 & data[8] == 0x02) { - if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.StartingAddressInvalidException("Starting address invalid or starting address + quantity invalid"); } if (data[7] == 0x86 & data[8] == 0x03) { - if (debug) StoreLogData.Instance.Store("QuantityInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("QuantityInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.QuantityInvalidException("quantity invalid"); } if (data[7] == 0x86 & data[8] == 0x04) { - if (debug) StoreLogData.Instance.Store("ModbusException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ModbusException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ModbusException("error reading"); } if (serialport != null) { crc = BitConverter.GetBytes(calculateCRC(data, 6, 6)); - if ((crc[0] != data[12] | crc[1] != data[13]) & dataReceived) - { - if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Throwed", System.DateTime.Now); + if ((crc[0] != data[12] | crc[1] != data[13]) & dataReceived) + { + if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { - countRetries = 0; - throw new EasyModbus.Exceptions.CRCCheckFailedException("Response CRC check failed"); + countRetries = 0; + throw new EasyModbus.Exceptions.CRCCheckFailedException("Response CRC check failed"); } else { @@ -1997,10 +1995,10 @@ public void WriteSingleRegister(int startingAddress, int value) WriteSingleRegister(startingAddress, value); } } - else if (!dataReceived) - { - if (debug) StoreLogData.Instance.Store("TimeoutException Throwed", System.DateTime.Now); - if (NumberOfRetries <= countRetries) + else if (!dataReceived & this.unitIdentifier != 0) + { + if (debug) StoreLogData.Instance.Store("TimeoutException Thrown", System.DateTime.Now); + if (NumberOfRetries <= countRetries & this.unitIdentifier != 0) { countRetries = 0; throw new TimeoutException("No Response from Modbus Slave"); @@ -2033,12 +2031,12 @@ public void WriteMultipleCoils(int startingAddress, bool[] values) if (serialport != null) if (!serialport.IsOpen) { - if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.SerialPortNotOpenedException("serial port not opened"); } if (tcpClient == null & !udpFlag & serialport == null) { - if (debug) StoreLogData.Instance.Store("ConnectionException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ConnectionException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ConnectionException("connection error"); } this.transactionIdentifier = BitConverter.GetBytes((uint)transactionIdentifierInternal); @@ -2104,7 +2102,7 @@ public void WriteMultipleCoils(int startingAddress, bool[] values) readBuffer = new byte[256]; DateTime dateTimeSend = DateTime.Now; byte receivedUnitIdentifier = 0xFF; - while (receivedUnitIdentifier != this.unitIdentifier & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout)) + while (this.unitIdentifier != 0 & receivedUnitIdentifier != this.unitIdentifier & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout)) { while (dataReceived == false & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout)) System.Threading.Thread.Sleep(1); @@ -2158,30 +2156,30 @@ public void WriteMultipleCoils(int startingAddress, bool[] values) } if (data[7] == 0x8F & data[8] == 0x01) { - if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.FunctionCodeNotSupportedException("Function code not supported by master"); } if (data[7] == 0x8F & data[8] == 0x02) { - if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.StartingAddressInvalidException("Starting address invalid or starting address + quantity invalid"); } if (data[7] == 0x8F & data[8] == 0x03) { - if (debug) StoreLogData.Instance.Store("QuantityInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("QuantityInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.QuantityInvalidException("quantity invalid"); } if (data[7] == 0x8F & data[8] == 0x04) { - if (debug) StoreLogData.Instance.Store("ModbusException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ModbusException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ModbusException("error reading"); } if (serialport != null) { crc = BitConverter.GetBytes(calculateCRC(data, 6, 6)); - if ((crc[0] != data[12] | crc[1] != data[13]) & dataReceived) - { - if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Throwed", System.DateTime.Now); + if ((crc[0] != data[12] | crc[1] != data[13]) & dataReceived) + { + if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -2193,9 +2191,9 @@ public void WriteMultipleCoils(int startingAddress, bool[] values) WriteMultipleCoils(startingAddress, values); } } - else if (!dataReceived) - { - if (debug) StoreLogData.Instance.Store("TimeoutException Throwed", System.DateTime.Now); + else if (!dataReceived & this.unitIdentifier != 0) + { + if (debug) StoreLogData.Instance.Store("TimeoutException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -2228,12 +2226,12 @@ public void WriteMultipleRegisters(int startingAddress, int[] values) if (serialport != null) if (!serialport.IsOpen) { - if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.SerialPortNotOpenedException("serial port not opened"); } if (tcpClient == null & !udpFlag & serialport == null) { - if (debug) StoreLogData.Instance.Store("ConnectionException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ConnectionException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ConnectionException("connection error"); } this.transactionIdentifier = BitConverter.GetBytes((uint)transactionIdentifierInternal); @@ -2289,7 +2287,7 @@ public void WriteMultipleRegisters(int startingAddress, int[] values) readBuffer = new byte[256]; DateTime dateTimeSend = DateTime.Now; byte receivedUnitIdentifier = 0xFF; - while (receivedUnitIdentifier != this.unitIdentifier & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout)) + while (this.unitIdentifier != 0 & receivedUnitIdentifier != this.unitIdentifier & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout)) { while (dataReceived == false & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout)) System.Threading.Thread.Sleep(1); @@ -2342,30 +2340,30 @@ public void WriteMultipleRegisters(int startingAddress, int[] values) } if (data[7] == 0x90 & data[8] == 0x01) { - if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.FunctionCodeNotSupportedException("Function code not supported by master"); } if (data[7] == 0x90 & data[8] == 0x02) { - if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.StartingAddressInvalidException("Starting address invalid or starting address + quantity invalid"); } if (data[7] == 0x90 & data[8] == 0x03) { - if (debug) StoreLogData.Instance.Store("QuantityInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("QuantityInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.QuantityInvalidException("quantity invalid"); } if (data[7] == 0x90 & data[8] == 0x04) { - if (debug) StoreLogData.Instance.Store("ModbusException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ModbusException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ModbusException("error reading"); } if (serialport != null) { crc = BitConverter.GetBytes(calculateCRC(data, 6, 6)); - if ((crc[0] != data[12] | crc[1] != data[13]) &dataReceived) - { - if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Throwed", System.DateTime.Now); + if ((crc[0] != data[12] | crc[1] != data[13]) &dataReceived) + { + if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -2377,9 +2375,9 @@ public void WriteMultipleRegisters(int startingAddress, int[] values) WriteMultipleRegisters(startingAddress, values); } } - else if (!dataReceived) - { - if (debug) StoreLogData.Instance.Store("TimeoutException Throwed", System.DateTime.Now); + else if (!dataReceived & this.unitIdentifier != 0) + { + if (debug) StoreLogData.Instance.Store("TimeoutException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -2419,17 +2417,17 @@ public int[] ReadWriteMultipleRegisters(int startingAddressRead, int quantityRea if (serialport != null) if (!serialport.IsOpen) { - if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.SerialPortNotOpenedException("serial port not opened"); } if (tcpClient == null & !udpFlag & serialport == null) { - if (debug) StoreLogData.Instance.Store("ConnectionException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ConnectionException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ConnectionException("connection error"); } if (startingAddressRead > 65535 | quantityRead > 125 | startingAddressWrite > 65535 | values.Length > 121) { - if (debug) StoreLogData.Instance.Store("ArgumentException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ArgumentException Thrown", System.DateTime.Now); throw new ArgumentException("Starting address must be 0 - 65535; quantity must be 0 - 2000"); } int[] response; @@ -2546,22 +2544,22 @@ public int[] ReadWriteMultipleRegisters(int startingAddressRead, int quantityRea } if (data[7] == 0x97 & data[8] == 0x01) { - if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.FunctionCodeNotSupportedException("Function code not supported by master"); } if (data[7] == 0x97 & data[8] == 0x02) { - if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.StartingAddressInvalidException("Starting address invalid or starting address + quantity invalid"); } if (data[7] == 0x97 & data[8] == 0x03) { - if (debug) StoreLogData.Instance.Store("QuantityInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("QuantityInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.QuantityInvalidException("quantity invalid"); } if (data[7] == 0x97 & data[8] == 0x04) { - if (debug) StoreLogData.Instance.Store("ModbusException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ModbusException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ModbusException("error reading"); } response = new int[quantityRead]; diff --git a/EasyModbus/ModbusServer.cs b/EasyModbus/ModbusServer.cs index 19012c8..8a771bf 100644 --- a/EasyModbus/ModbusServer.cs +++ b/EasyModbus/ModbusServer.cs @@ -145,7 +145,7 @@ private int GetAndCleanNumberOfConnectedClients(Client client) { lock (this) { - int i = 0; + /*int i = 0;*/ bool objetExists = false; foreach (Client clientLoop in tcpClientLastRequestList) { @@ -188,7 +188,7 @@ private void ReadCallback(IAsyncResult asyncResult) read = networkStream.EndRead(asyncResult); } - catch (Exception ex) + catch (Exception) { return; } @@ -273,14 +273,14 @@ public class ModbusServer { private bool debug = false; Int32 port = 502; - ModbusProtocol receiveData; + /*ModbusProtocol receiveData;*/ ModbusProtocol sendData = new ModbusProtocol(); Byte[] bytes = new Byte[2100]; //public Int16[] _holdingRegisters = new Int16[65535]; - public HoldingRegisters holdingRegisters; - public InputRegisters inputRegisters; - public Coils coils; - public DiscreteInputs discreteInputs; + public HoldingRegistersClass holdingRegisters; + public InputRegistersClass inputRegisters; + public CoilsClass coils; + public DiscreteInputsClass discreteInputs; private int numberOfConnections = 0; private bool udpFlag; private bool serialFlag; @@ -296,7 +296,7 @@ public class ModbusServer private IPEndPoint iPEndPoint; private TCPHandler tcpHandler; Thread listenerThread; - Thread clientConnectionThread; + private Thread clientConnectionThread; private ModbusProtocol[] modbusLogData = new ModbusProtocol[100]; public bool FunctionCode1Disabled {get; set;} public bool FunctionCode2Disabled { get; set; } @@ -316,10 +316,10 @@ public class ModbusServer public ModbusServer() { - holdingRegisters = new HoldingRegisters(this); - inputRegisters = new InputRegisters(this); - coils = new Coils(this); - discreteInputs = new DiscreteInputs(this); + holdingRegisters = new HoldingRegistersClass(this); + inputRegisters = new InputRegistersClass(this); + coils = new CoilsClass(this); + discreteInputs = new DiscreteInputsClass(this); } @@ -642,7 +642,7 @@ private void ProcessReceivedData(object networkConnectionParameter) } } } - catch (Exception exc) + catch (Exception) { } this.CreateAnswer(receiveDataThread, sendDataThread, stream, portIn, ipAddressIn); //this.sendAnswer(); @@ -2153,12 +2153,12 @@ public string LogFileFilename - public class HoldingRegisters + public class HoldingRegistersClass { public Int16[] localArray = new Int16[65535]; ModbusServer modbusServer; - public HoldingRegisters(EasyModbus.ModbusServer modbusServer) + public HoldingRegistersClass(EasyModbus.ModbusServer modbusServer) { this.modbusServer = modbusServer; } @@ -2174,12 +2174,12 @@ public Int16 this[int x] } } - public class InputRegisters + public class InputRegistersClass { public Int16[] localArray = new Int16[65535]; ModbusServer modbusServer; - public InputRegisters(EasyModbus.ModbusServer modbusServer) + public InputRegistersClass(EasyModbus.ModbusServer modbusServer) { this.modbusServer = modbusServer; } @@ -2195,12 +2195,12 @@ public Int16 this[int x] } } - public class Coils + public class CoilsClass { public bool[] localArray = new bool[65535]; ModbusServer modbusServer; - public Coils(EasyModbus.ModbusServer modbusServer) + public CoilsClass(EasyModbus.ModbusServer modbusServer) { this.modbusServer = modbusServer; } @@ -2216,12 +2216,12 @@ public bool this[int x] } } - public class DiscreteInputs + public class DiscreteInputsClass { public bool[] localArray = new bool[65535]; ModbusServer modbusServer; - public DiscreteInputs(EasyModbus.ModbusServer modbusServer) + public DiscreteInputsClass(EasyModbus.ModbusServer modbusServer) { this.modbusServer = modbusServer; } diff --git a/EasyModbus/Properties/AssemblyInfo.cs b/EasyModbus/Properties/AssemblyInfo.cs index 6c9dff7..428c5ab 100644 --- a/EasyModbus/Properties/AssemblyInfo.cs +++ b/EasyModbus/Properties/AssemblyInfo.cs @@ -1,31 +1,8 @@ -#region Using directives - + using System; using System.Reflection; using System.Runtime.InteropServices; -#endregion - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("EasyModbus")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Stefan Rossmann Engineering Solutions")] -[assembly: AssemblyProduct("EasyModbus")] -[assembly: AssemblyCopyright("Copyright 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // This sets the default COM visibility of types in the assembly to invisible. // If you need to expose a type to COM, use [ComVisible(true)] on that type. [assembly: ComVisible(false)] - -// The assembly version has following format : -// -// Major.Minor.Build.Revision -// -// You can specify all the values or you can use the default the Revision and -// Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("5.5.0")] diff --git a/EasyModbusAdvancedClient/AddConnectionForm.Designer.cs b/EasyModbusAdvancedClient/AddConnectionForm.Designer.cs index 1fac5c1..9666ac8 100644 --- a/EasyModbusAdvancedClient/AddConnectionForm.Designer.cs +++ b/EasyModbusAdvancedClient/AddConnectionForm.Designer.cs @@ -6,6 +6,8 @@ * * To change this template use Tools | Options | Coding | Edit Standard Headers. */ +using System.ComponentModel; + namespace EasyModbusAdvancedClient { partial class AddConnectionForm @@ -13,7 +15,7 @@ partial class AddConnectionForm /// /// Designer variable used to keep track of non-visual components. /// - private System.ComponentModel.IContainer components = null; + private IContainer components = null; /// /// Disposes resources used by the form. diff --git a/EasyModbusAdvancedClient/AddConnectionForm.cs b/EasyModbusAdvancedClient/AddConnectionForm.cs index 6b74d1e..3a6dc6a 100644 --- a/EasyModbusAdvancedClient/AddConnectionForm.cs +++ b/EasyModbusAdvancedClient/AddConnectionForm.cs @@ -22,8 +22,8 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ using System; -using System.Drawing; using System.ComponentModel; +using System.Drawing; using System.Windows.Forms; namespace EasyModbusAdvancedClient diff --git a/EasyModbusAdvancedClient/EasyModbusAdvancedClient.csproj b/EasyModbusAdvancedClient/EasyModbusAdvancedClient.csproj index 77592b0..31979c6 100644 --- a/EasyModbusAdvancedClient/EasyModbusAdvancedClient.csproj +++ b/EasyModbusAdvancedClient/EasyModbusAdvancedClient.csproj @@ -1,127 +1,74 @@ - - + - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4} - Debug - AnyCPU WinExe - EasyModbusAdvancedClient - EasyModbusAdvancedClient - v4.5 - - - Properties + net5.0 + EasyModbusAdvancedClient + Stefan Rossmann Engineering Solutions + EasyModbusAdvancedClient + Copyright 2018 + 5.1.0 + 5.1.0 x86 - bin\Debug\ - True + bin\$(Configuration)\ Full - False True - DEBUG;TRACE - bin\Release\ - False + bin\$(Configuration)\ None - True - False - TRACE true - bin\DebugCommercial1\ + bin\$(Configuration)\ DEBUG;TRACE true Full x86 MinimumRecommendedRules.ruleset - false - false TRACE;DEBUG;SSL - - false - - - - 3.5 - - - - 3.5 - - - - - - 3.5 - - - - - Exceptions\Exceptions.cs - - - ModbusClient.cs - - - ModbusServer.cs - - - StoreLogData.cs - - - Form - - + + + + + + AddConnectionForm.cs - - Form - - + + AddFunctionCodeForm.cs - - - Form - - + + MainForm.cs - - - + True True Resources.resx - + AddConnectionForm.cs - + AddFunctionCodeForm.cs - + MainForm.Designer.cs Always - - ResXFileCodeGenerator - Resources.Designer.cs - - @@ -146,7 +93,22 @@ - + + + + + + + ..\EasyModbus\bin\Release\EasyModbus.dll + + + ..\..\..\..\..\..\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\5.0.0-preview.6.20308.1\ref\net5.0\System.Drawing.Common.dll + + + ..\..\..\..\..\..\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\5.0.0-preview.6.20308.1\ref\net5.0\System.Windows.Forms.dll + + + ..\..\..\..\..\..\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\5.0.0-preview.6.20308.1\ref\net5.0\System.Windows.Forms.Primitives.dll + - \ No newline at end of file diff --git a/EasyModbusAdvancedClient/Properties/AssemblyInfo.cs b/EasyModbusAdvancedClient/Properties/AssemblyInfo.cs index 4fae2f9..428c5ab 100644 --- a/EasyModbusAdvancedClient/Properties/AssemblyInfo.cs +++ b/EasyModbusAdvancedClient/Properties/AssemblyInfo.cs @@ -1,31 +1,8 @@ -#region Using directives - + using System; using System.Reflection; using System.Runtime.InteropServices; -#endregion - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("EasyModbusAdvancedClient")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Stefan Rossmann Engineering Solutions")] -[assembly: AssemblyProduct("EasyModbusAdvancedClient")] -[assembly: AssemblyCopyright("Copyright 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // This sets the default COM visibility of types in the assembly to invisible. // If you need to expose a type to COM, use [ComVisible(true)] on that type. [assembly: ComVisible(false)] - -// The assembly version has following format : -// -// Major.Minor.Build.Revision -// -// You can specify all the values or you can use the default the Revision and -// Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("5.1.0")] diff --git a/EasyModbusAdvancedClient/Properties/Resources.Designer.cs b/EasyModbusAdvancedClient/Properties/Resources.Designer.cs index 7c0f175..0f79825 100644 --- a/EasyModbusAdvancedClient/Properties/Resources.Designer.cs +++ b/EasyModbusAdvancedClient/Properties/Resources.Designer.cs @@ -10,8 +10,9 @@ namespace EasyModbusAdvancedClient.Properties { using System; - - + using System.Drawing; + + /// /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. /// @@ -61,82 +62,82 @@ internal Resources() { } /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// Sucht eine lokalisierte Ressource vom Typ Bitmap. /// - internal static System.Drawing.Bitmap network_connect { + internal static Bitmap network_connect { get { object obj = ResourceManager.GetObject("network-connect", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ((Bitmap)(obj)); } } /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// Sucht eine lokalisierte Ressource vom Typ Bitmap. /// - internal static System.Drawing.Bitmap network_connect_2 { + internal static Bitmap network_connect_2 { get { object obj = ResourceManager.GetObject("network-connect-2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ((Bitmap)(obj)); } } /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// Sucht eine lokalisierte Ressource vom Typ Bitmap. /// - internal static System.Drawing.Bitmap network_disconnect_2 { + internal static Bitmap network_disconnect_2 { get { object obj = ResourceManager.GetObject("network-disconnect-2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ((Bitmap)(obj)); } } /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// Sucht eine lokalisierte Ressource vom Typ Bitmap. /// - internal static System.Drawing.Bitmap process_stop_2 { + internal static Bitmap process_stop_2 { get { object obj = ResourceManager.GetObject("process-stop-2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ((Bitmap)(obj)); } } /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// Sucht eine lokalisierte Ressource vom Typ Bitmap. /// - internal static System.Drawing.Bitmap tab { + internal static Bitmap tab { get { object obj = ResourceManager.GetObject("tab", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ((Bitmap)(obj)); } } /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// Sucht eine lokalisierte Ressource vom Typ Bitmap. /// - internal static System.Drawing.Bitmap tab_close { + internal static Bitmap tab_close { get { object obj = ResourceManager.GetObject("tab-close", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ((Bitmap)(obj)); } } /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// Sucht eine lokalisierte Ressource vom Typ Bitmap. /// - internal static System.Drawing.Bitmap tab_new { + internal static Bitmap tab_new { get { object obj = ResourceManager.GetObject("tab-new", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ((Bitmap)(obj)); } } /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// Sucht eine lokalisierte Ressource vom Typ Bitmap. /// - internal static System.Drawing.Bitmap view_refresh_2 { + internal static Bitmap view_refresh_2 { get { object obj = ResourceManager.GetObject("view-refresh-2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ((Bitmap)(obj)); } } } diff --git a/EasyModbusClientExample/EasyModbusClientExample.csproj b/EasyModbusClientExample/EasyModbusClientExample.csproj index 16d52ef..58f4699 100644 --- a/EasyModbusClientExample/EasyModbusClientExample.csproj +++ b/EasyModbusClientExample/EasyModbusClientExample.csproj @@ -1,110 +1,60 @@ - - + - {9412077F-7DFF-45D0-AFF9-7D5303118EA7} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Debug - AnyCPU WinExe - EasyModbusClientExample - EasyModbusClientExample - v4.5 - Properties - + net5.0 + EasyModbusClientExample + Stefan Rossmann Engineering Solutions + EasyModbusClientExample + Copyright 2018 + 5.5.0 + 5.5.0 x86 - bin\Debug\ - True + bin\$(Configuration)\ Full - False True - DEBUG;TRACE - bin\Release\ - False + bin\$(Configuration)\ None - True - False - TRACE true - bin\DebugCommercial2\ + bin\$(Configuration)\ TRACE;DEBUG;COMMERCIAL true Full x86 MinimumRecommendedRules.ruleset - false - false TRACE;DEBUG;SSL - - false - - - 4.0 - - - - 3.5 - - - - 3.5 - - - - - - 3.5 - - - - - Exceptions\Exceptions.cs - - - ModbusClient.cs - - - ModbusServer.cs - - - StoreLogData.cs - - + + + + + Form - + MainForm.cs - - - + True True Resources.resx - - - - + MainForm.cs - - ResXFileCodeGenerator - Resources.Designer.cs - @@ -127,5 +77,20 @@ - + + + + + + + + ..\..\..\..\..\..\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\5.0.0-preview.6.20308.1\ref\net5.0\System.Drawing.Common.dll + + + ..\..\..\..\..\..\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\5.0.0-preview.6.20308.1\ref\net5.0\System.Windows.Forms.dll + + + ..\..\..\..\..\..\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\5.0.0-preview.6.20308.1\ref\net5.0\System.Windows.Forms.Primitives.dll + + \ No newline at end of file diff --git a/EasyModbusClientExample/Properties/AssemblyInfo.cs b/EasyModbusClientExample/Properties/AssemblyInfo.cs index 7c39ca9..428c5ab 100644 --- a/EasyModbusClientExample/Properties/AssemblyInfo.cs +++ b/EasyModbusClientExample/Properties/AssemblyInfo.cs @@ -1,31 +1,8 @@ -#region Using directives - + using System; using System.Reflection; using System.Runtime.InteropServices; -#endregion - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("EasyModbusClientExample")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Stefan Rossmann Engineering Solutions")] -[assembly: AssemblyProduct("EasyModbusClientExample")] -[assembly: AssemblyCopyright("Copyright 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // This sets the default COM visibility of types in the assembly to invisible. // If you need to expose a type to COM, use [ComVisible(true)] on that type. [assembly: ComVisible(false)] - -// The assembly version has following format : -// -// Major.Minor.Build.Revision -// -// You can specify all the values or you can use the default the Revision and -// Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("5.5.0")] diff --git a/EasyModbusClient_IOTCoreExample/App.xaml b/EasyModbusClient_IOTCoreExample/App.xaml deleted file mode 100644 index 4ecb99a..0000000 --- a/EasyModbusClient_IOTCoreExample/App.xaml +++ /dev/null @@ -1,8 +0,0 @@ - - - diff --git a/EasyModbusClient_IOTCoreExample/App.xaml.cs b/EasyModbusClient_IOTCoreExample/App.xaml.cs deleted file mode 100644 index 506165f..0000000 --- a/EasyModbusClient_IOTCoreExample/App.xaml.cs +++ /dev/null @@ -1,100 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.ApplicationModel; -using Windows.ApplicationModel.Activation; -using Windows.Foundation; -using Windows.Foundation.Collections; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; - -namespace EasyModbusClient_IOTCoreExample -{ - /// - /// Stellt das anwendungsspezifische Verhalten bereit, um die Standardanwendungsklasse zu ergänzen. - /// - sealed partial class App : Application - { - /// - /// Initialisiert das Singletonanwendungsobjekt. Dies ist die erste Zeile von erstelltem Code - /// und daher das logische Äquivalent von main() bzw. WinMain(). - /// - public App() - { - this.InitializeComponent(); - this.Suspending += OnSuspending; - } - - /// - /// Wird aufgerufen, wenn die Anwendung durch den Endbenutzer normal gestartet wird. Weitere Einstiegspunkte - /// werden z. B. verwendet, wenn die Anwendung gestartet wird, um eine bestimmte Datei zu öffnen. - /// - /// Details über Startanforderung und -prozess. - protected override void OnLaunched(LaunchActivatedEventArgs e) - { - Frame rootFrame = Window.Current.Content as Frame; - - // App-Initialisierung nicht wiederholen, wenn das Fenster bereits Inhalte enthält. - // Nur sicherstellen, dass das Fenster aktiv ist. - if (rootFrame == null) - { - // Frame erstellen, der als Navigationskontext fungiert und zum Parameter der ersten Seite navigieren - rootFrame = new Frame(); - - rootFrame.NavigationFailed += OnNavigationFailed; - - if (e.PreviousExecutionState == ApplicationExecutionState.Terminated) - { - //TODO: Zustand von zuvor angehaltener Anwendung laden - } - - // Den Frame im aktuellen Fenster platzieren - Window.Current.Content = rootFrame; - } - - if (e.PrelaunchActivated == false) - { - if (rootFrame.Content == null) - { - // Wenn der Navigationsstapel nicht wiederhergestellt wird, zur ersten Seite navigieren - // und die neue Seite konfigurieren, indem die erforderlichen Informationen als Navigationsparameter - // übergeben werden - rootFrame.Navigate(typeof(MainPage), e.Arguments); - } - // Sicherstellen, dass das aktuelle Fenster aktiv ist - Window.Current.Activate(); - } - } - - /// - /// Wird aufgerufen, wenn die Navigation auf eine bestimmte Seite fehlschlägt - /// - /// Der Rahmen, bei dem die Navigation fehlgeschlagen ist - /// Details über den Navigationsfehler - void OnNavigationFailed(object sender, NavigationFailedEventArgs e) - { - throw new Exception("Failed to load Page " + e.SourcePageType.FullName); - } - - /// - /// Wird aufgerufen, wenn die Ausführung der Anwendung angehalten wird. Der Anwendungszustand wird gespeichert, - /// ohne zu wissen, ob die Anwendung beendet oder fortgesetzt wird und die Speicherinhalte dabei - /// unbeschädigt bleiben. - /// - /// Die Quelle der Anhalteanforderung. - /// Details zur Anhalteanforderung. - private void OnSuspending(object sender, SuspendingEventArgs e) - { - var deferral = e.SuspendingOperation.GetDeferral(); - //TODO: Anwendungszustand speichern und alle Hintergrundaktivitäten beenden - deferral.Complete(); - } - } -} diff --git a/EasyModbusClient_IOTCoreExample/Assets/LockScreenLogo.scale-200.png b/EasyModbusClient_IOTCoreExample/Assets/LockScreenLogo.scale-200.png deleted file mode 100644 index 735f57a..0000000 Binary files a/EasyModbusClient_IOTCoreExample/Assets/LockScreenLogo.scale-200.png and /dev/null differ diff --git a/EasyModbusClient_IOTCoreExample/Assets/SplashScreen.scale-200.png b/EasyModbusClient_IOTCoreExample/Assets/SplashScreen.scale-200.png deleted file mode 100644 index 023e7f1..0000000 Binary files a/EasyModbusClient_IOTCoreExample/Assets/SplashScreen.scale-200.png and /dev/null differ diff --git a/EasyModbusClient_IOTCoreExample/Assets/Square150x150Logo.scale-200.png b/EasyModbusClient_IOTCoreExample/Assets/Square150x150Logo.scale-200.png deleted file mode 100644 index af49fec..0000000 Binary files a/EasyModbusClient_IOTCoreExample/Assets/Square150x150Logo.scale-200.png and /dev/null differ diff --git a/EasyModbusClient_IOTCoreExample/Assets/Square44x44Logo.scale-200.png b/EasyModbusClient_IOTCoreExample/Assets/Square44x44Logo.scale-200.png deleted file mode 100644 index ce342a2..0000000 Binary files a/EasyModbusClient_IOTCoreExample/Assets/Square44x44Logo.scale-200.png and /dev/null differ diff --git a/EasyModbusClient_IOTCoreExample/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/EasyModbusClient_IOTCoreExample/Assets/Square44x44Logo.targetsize-24_altform-unplated.png deleted file mode 100644 index f6c02ce..0000000 Binary files a/EasyModbusClient_IOTCoreExample/Assets/Square44x44Logo.targetsize-24_altform-unplated.png and /dev/null differ diff --git a/EasyModbusClient_IOTCoreExample/Assets/StoreLogo.png b/EasyModbusClient_IOTCoreExample/Assets/StoreLogo.png deleted file mode 100644 index 7385b56..0000000 Binary files a/EasyModbusClient_IOTCoreExample/Assets/StoreLogo.png and /dev/null differ diff --git a/EasyModbusClient_IOTCoreExample/Assets/Wide310x150Logo.scale-200.png b/EasyModbusClient_IOTCoreExample/Assets/Wide310x150Logo.scale-200.png deleted file mode 100644 index 288995b..0000000 Binary files a/EasyModbusClient_IOTCoreExample/Assets/Wide310x150Logo.scale-200.png and /dev/null differ diff --git a/EasyModbusClient_IOTCoreExample/EasyModbusClient_IOTCoreExample.csproj b/EasyModbusClient_IOTCoreExample/EasyModbusClient_IOTCoreExample.csproj deleted file mode 100644 index f917ac5..0000000 --- a/EasyModbusClient_IOTCoreExample/EasyModbusClient_IOTCoreExample.csproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - x86 - {9AC81F46-F110-46F3-B884-6665D8A05267} - AppContainerExe - Properties - EasyModbusClient_IOTCoreExample - EasyModbusClient_IOTCoreExample - de-DE - UAP - 10.0.16299.0 - 10.0.16299.0 - 14 - 512 - {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - true - EasyModbusClient_IOTCoreExample_TemporaryKey.pfx - - - true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - x86 - false - prompt - true - - - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - x86 - false - prompt - true - true - - - true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - ARM - false - prompt - true - - - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - ARM - false - prompt - true - true - - - true - bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - x64 - false - prompt - true - - - bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - x64 - false - prompt - true - true - - - PackageReference - - - - App.xaml - - - MainPage.xaml - - - - - - Designer - - - - - - - - - - - - - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - - - 5.4.0 - - - 1.0.0 - - - - - Windows Desktop Extensions for the UWP - - - Windows IoT Extensions for the UWP - - - - - - - 14.0 - - - - \ No newline at end of file diff --git a/EasyModbusClient_IOTCoreExample/MainPage.xaml b/EasyModbusClient_IOTCoreExample/MainPage.xaml deleted file mode 100644 index a246428..0000000 --- a/EasyModbusClient_IOTCoreExample/MainPage.xaml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - -