From 0735a768ea493552b5683d5d8fac3d2fa29b9f93 Mon Sep 17 00:00:00 2001 From: Samuel Ventura Date: Wed, 25 Oct 2017 16:26:24 -0500 Subject: [PATCH] SharpModbus-RELEASE-1.0.6.0 No functional changes from 1.0.5. Moved to vscode/.netcore CLI. Nuget package now supports net40 and netstandard2.0. --- Package.bat | 8 - README.md | 10 +- SharpModbus.sln | 26 - SharpModbus/Properties/AssemblyInfo.cs | 31 - SharpModbus/SharpModbus.csproj | 88 +- SharpModbus/package.nuspec | 14 - .../MasterTest.cs | 0 SharpModbusLiveTest/SharpModbusTest.csproj | 15 + .../snappac.otg | 0 .../{SlaveTest.cs => MasterSlaveTest.cs} | 0 SharpModbusTest/OpenCover/coverage.xml | 3004 ----------------- SharpModbusTest/Properties/AssemblyInfo.cs | 31 - SharpModbusTest/SharpModbusTest.csproj | 67 +- 13 files changed, 49 insertions(+), 3245 deletions(-) delete mode 100644 Package.bat delete mode 100644 SharpModbus.sln delete mode 100644 SharpModbus/Properties/AssemblyInfo.cs delete mode 100644 SharpModbus/package.nuspec rename {SharpModbusTest => SharpModbusLiveTest}/MasterTest.cs (100%) create mode 100644 SharpModbusLiveTest/SharpModbusTest.csproj rename {SharpModbusTest => SharpModbusLiveTest}/snappac.otg (100%) rename SharpModbusTest/{SlaveTest.cs => MasterSlaveTest.cs} (100%) delete mode 100644 SharpModbusTest/OpenCover/coverage.xml delete mode 100644 SharpModbusTest/Properties/AssemblyInfo.cs diff --git a/Package.bat b/Package.bat deleted file mode 100644 index 375d833..0000000 --- a/Package.bat +++ /dev/null @@ -1,8 +0,0 @@ -TITLE NuGet Packager -@ECHO ON - -CD %~dp0 -CD .. -nuget pack SharpModbus\SharpModbus\package.nuspec -PAUSE - diff --git a/README.md b/README.md index 273ca02..89fc38a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # SharpModbus -C# Modbus Tools +C# Modbus Tools ## Usage @@ -9,7 +9,13 @@ Look the tests at the SharpModbusTest subproject. [SharpMaster](https://github.com/samuelventura/SharpMaster) uses SharpModbus too. +## Development Setup + +- Windows 10 Pro 64x (up to date .Net) +- Visual Studio Code +- dotnet-sdk-2.0.2-win-x64.exe +- dotnet CLI + ## TODO - [ ] Improve documentation and samples -- [ ] Remove transactionId property from protocols diff --git a/SharpModbus.sln b/SharpModbus.sln deleted file mode 100644 index 8441ac3..0000000 --- a/SharpModbus.sln +++ /dev/null @@ -1,26 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -# SharpDevelop 5.1 -VisualStudioVersion = 12.0.20827.3 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpModbus", "SharpModbus\SharpModbus.csproj", "{9682C3A4-4703-417C-B29C-D68AFBD97EC6}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpModbusTest", "SharpModbusTest\SharpModbusTest.csproj", "{A0C3A91A-92B8-42DD-8E89-3CF8ECA79B1D}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9682C3A4-4703-417C-B29C-D68AFBD97EC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9682C3A4-4703-417C-B29C-D68AFBD97EC6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9682C3A4-4703-417C-B29C-D68AFBD97EC6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9682C3A4-4703-417C-B29C-D68AFBD97EC6}.Release|Any CPU.Build.0 = Release|Any CPU - {A0C3A91A-92B8-42DD-8E89-3CF8ECA79B1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0C3A91A-92B8-42DD-8E89-3CF8ECA79B1D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0C3A91A-92B8-42DD-8E89-3CF8ECA79B1D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0C3A91A-92B8-42DD-8E89-3CF8ECA79B1D}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection -EndGlobal diff --git a/SharpModbus/Properties/AssemblyInfo.cs b/SharpModbus/Properties/AssemblyInfo.cs deleted file mode 100644 index cd935bc..0000000 --- a/SharpModbus/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,31 +0,0 @@ -#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("SharpModbus")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("samuel.ventura@yeico.com")] -[assembly: AssemblyProduct("SharpModbus")] -[assembly: AssemblyCopyright("Copyright 2017 Samuel Ventura")] -[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("1.0.*")] diff --git a/SharpModbus/SharpModbus.csproj b/SharpModbus/SharpModbus.csproj index c771b6f..6501804 100644 --- a/SharpModbus/SharpModbus.csproj +++ b/SharpModbus/SharpModbus.csproj @@ -1,77 +1,21 @@ - - + + - {9682C3A4-4703-417C-B29C-D68AFBD97EC6} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Debug - AnyCPU - Library - SharpModbus - SharpModbus - v4.0 - Properties - - - - AnyCPU - - - bin\Debug\ - True - Full - False - True - DEBUG;TRACE - - - bin\Release\ - False - None - True - False - TRACE + net40;netstandard2.0 + SharpModbus + 1.0.6.0 + C# Modbus Tools + Samuel Ventura + https://github.com/samuelventura/SharpModbus + https://www.apache.org/licenses/LICENSE-2.0 + Modbus TCP RTU Master Slave Serial + - - - 3.5 - - - - 3.5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - \ No newline at end of file + + diff --git a/SharpModbus/package.nuspec b/SharpModbus/package.nuspec deleted file mode 100644 index 8e14822..0000000 --- a/SharpModbus/package.nuspec +++ /dev/null @@ -1,14 +0,0 @@ - - - - SharpModbus - 1.0.5.0 - Samuel Ventura - C# Modbus Tools - https://github.com/samuelventura/SharpModbus - https://www.apache.org/licenses/LICENSE-2.0 - - - - - diff --git a/SharpModbusTest/MasterTest.cs b/SharpModbusLiveTest/MasterTest.cs similarity index 100% rename from SharpModbusTest/MasterTest.cs rename to SharpModbusLiveTest/MasterTest.cs diff --git a/SharpModbusLiveTest/SharpModbusTest.csproj b/SharpModbusLiveTest/SharpModbusTest.csproj new file mode 100644 index 0000000..cf46559 --- /dev/null +++ b/SharpModbusLiveTest/SharpModbusTest.csproj @@ -0,0 +1,15 @@ + + + + net451 + + + + + + + + + + + diff --git a/SharpModbusTest/snappac.otg b/SharpModbusLiveTest/snappac.otg similarity index 100% rename from SharpModbusTest/snappac.otg rename to SharpModbusLiveTest/snappac.otg diff --git a/SharpModbusTest/SlaveTest.cs b/SharpModbusTest/MasterSlaveTest.cs similarity index 100% rename from SharpModbusTest/SlaveTest.cs rename to SharpModbusTest/MasterSlaveTest.cs diff --git a/SharpModbusTest/OpenCover/coverage.xml b/SharpModbusTest/OpenCover/coverage.xml deleted file mode 100644 index ce9ce14..0000000 --- a/SharpModbusTest/OpenCover/coverage.xml +++ /dev/null @@ -1,3004 +0,0 @@ - - - - - - C:\Windows\Microsoft.Net\assembly\GAC_32\mscorlib\v4.0_4.0.0.0__b77a5c561934e089\mscorlib.dll - mscorlib - - - - C:\Program Files (x86)\SharpDevelop\5.1\bin\Tools\NUnit\nunit-console-x86.exe - nunit-console - - - - C:\Program Files (x86)\SharpDevelop\5.1\bin\Tools\NUnit\lib\nunit.core.dll - nunit.core - - - - C:\Program Files (x86)\SharpDevelop\5.1\bin\Tools\NUnit\lib\nunit-console-runner.dll - nunit-console-runner - - - - C:\Program Files (x86)\SharpDevelop\5.1\bin\Tools\NUnit\lib\nunit.util.dll - nunit.util - - - - C:\Program Files (x86)\SharpDevelop\5.1\bin\Tools\NUnit\lib\nunit.core.interfaces.dll - nunit.core.interfaces - - - - C:\Windows\Microsoft.Net\assembly\GAC_MSIL\System.Configuration\v4.0_4.0.0.0__b03f5f7f11d50a3a\System.Configuration.dll - System.Configuration - - - - C:\Windows\Microsoft.Net\assembly\GAC_MSIL\System\v4.0_4.0.0.0__b77a5c561934e089\System.dll - System - - - - C:\Windows\Microsoft.Net\assembly\GAC_MSIL\System.Xml\v4.0_4.0.0.0__b77a5c561934e089\System.Xml.dll - System.Xml - - - - C:\Windows\Microsoft.Net\assembly\GAC_MSIL\System.Runtime.Remoting\v4.0_4.0.0.0__b77a5c561934e089\System.Runtime.Remoting.dll - System.Runtime.Remoting - - - - C:\Windows\Microsoft.Net\assembly\GAC_MSIL\System.Core\v4.0_4.0.0.0__b77a5c561934e089\System.Core.dll - System.Core - - - - - C:\Users\samuel\AppData\Local\Temp\nunit20\ShadowCopyCache\916_636217614009224081\Tests_89139828\assembly\dl3\d657b0a8\41fa17ba_a77ed201\SharpModbusTest.dll - SharpModbusTest - - - - - - - - - <Module> - - - - - SharpModbusTest.MasterTest - - - - 100663297 - System.Boolean[] SharpModbusTest.MasterTest::Bools(System.Int32,System.Boolean) - - - - - - - - - - - - - - - - - - - - 100663298 - System.Void SharpModbusTest.MasterTest::RackSweepTest() - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100663299 - System.Void SharpModbusTest.MasterTest::SetAnalog(SharpModbus.ModbusMaster,System.Int32,System.Single) - - - - - - - - - - - - - - 100663300 - System.Void SharpModbusTest.MasterTest::SetAnalog2(SharpModbus.ModbusMaster,System.Int32,System.Single) - - - - - - - - - - - - - 100663301 - System.Single SharpModbusTest.MasterTest::GetAnalog(SharpModbus.ModbusMaster,System.Int32) - - - - - - - - - - - - - - - - - - 100663302 - System.Single SharpModbusTest.MasterTest::GetAnalog2(SharpModbus.ModbusMaster,System.Int32) - - - - - - - - - - - - - - - - - - 100663303 - System.Single SharpModbusTest.MasterTest::ByteArrayToFloat(System.Byte[]) - - - - - - - - - - - - - - - - - 100663304 - System.Byte[] SharpModbusTest.MasterTest::FloatToByteArray(System.Single) - - - - - - - - - - - - - - - - - - 100663305 - System.Void SharpModbusTest.MasterTest::.ctor() - - - - - - - - - SharpModbusTest.ParserTest - - - - 100663306 - System.Void SharpModbusTest.ParserTest::ParseTest() - - - - - - - - - - - - - - - - - - - - - - - - - - 100663307 - System.Void SharpModbusTest.ParserTest::Test(SharpModbus.IModbusCommand) - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100663308 - System.Void SharpModbusTest.ParserTest::.ctor() - - - - - - - - - - - - - SharpModbusTest.EncodeTest - - - - 100663309 - System.Void SharpModbusTest.EncodeTest::DecodeBoolsTest() - - - - - - - - - - - - - - 100663310 - System.Void SharpModbusTest.EncodeTest::EncodeBoolsTest() - - - - - - - - - - - - - - - - 100663311 - System.Void SharpModbusTest.EncodeTest::.ctor() - - - - - - - - - <PrivateImplementationDetails>{1306974D-F861-47F3-9F84-02C2DAC6C104} - - - - - - C:\Users\samuel\AppData\Local\Temp\nunit20\ShadowCopyCache\916_636217614009224081\Tests_89139828\assembly\dl3\f4e59c6d\000fd480_1f40d101\nunit.framework.dll - nunit.framework - - - - - C:\Users\samuel\AppData\Local\Temp\nunit20\ShadowCopyCache\916_636217614009224081\Tests_89139828\assembly\dl3\bb7b8f77\d802548b_a77ed201\SharpModbus.dll - SharpModbus - - - - - - - - - - - - - - - - - - - - - - - - - <Module> - - - - - SharpModbus.TcpTools - - - - 100663297 - System.Net.Sockets.TcpClient SharpModbus.TcpTools::ConnectWithTimeout(System.String,System.Int32,System.Int32) - - - - - - - - - - - - - - - - - - - - - - SharpModbus.Assert - - - - 100663298 - System.Void SharpModbus.Assert::Equal(System.Int32,System.Int32,System.String) - - - - - - - - - - - - - - - - 100663299 - System.Void SharpModbus.Assert::Equal(System.Int32,System.Int32,System.Int32,System.String) - - - - - - - - - - - - - - - - - - SharpModbus.Disposer - - - - 100663300 - System.Void SharpModbus.Disposer::Dispose(System.IDisposable) - - - - - - - - - - - - - - - - - - - - - 100663301 - System.Void SharpModbus.Disposer::Close(System.Net.Sockets.TcpListener) - - - - - - - - - - - - - - - - - - - - - - - SharpModbus.Thrower - - - - 100663302 - System.Void SharpModbus.Thrower::Throw(System.String,System.Object[]) - - - - - - - - - - - - - - - - - - - 100663303 - System.Void SharpModbus.Thrower::Throw(System.Exception,System.String,System.Object[]) - - - - - - - - - - - - - - - - - - - - - SharpModbus.ModbusF02ReadInputs - - - - 100663313 - System.Byte SharpModbus.ModbusF02ReadInputs::get_Slave() - - - - - - - - - - - - 100663314 - System.UInt16 SharpModbus.ModbusF02ReadInputs::get_Address() - - - - - - - - - - - - 100663315 - System.UInt16 SharpModbus.ModbusF02ReadInputs::get_Count() - - - - - - - - - - - - 100663316 - System.Int32 SharpModbus.ModbusF02ReadInputs::get_RequestLength() - - - - - - - - - - - - 100663317 - System.Int32 SharpModbus.ModbusF02ReadInputs::get_ResponseLength() - - - - - - - - - - - - 100663318 - System.Void SharpModbus.ModbusF02ReadInputs::.ctor(System.Byte,System.UInt16,System.UInt16) - - - - - - - - - - - - - - - 100663319 - System.Void SharpModbus.ModbusF02ReadInputs::FillRequest(System.Byte[],System.Int32) - - - - - - - - - - - - - - - - - 100663320 - System.Object SharpModbus.ModbusF02ReadInputs::ParseResponse(System.Byte[],System.Int32) - - - - - - - - - - - - - - - - 100663321 - System.String SharpModbus.ModbusF02ReadInputs::ToString() - - - - - - - - - - - - - - SharpModbus.ModbusF01ReadCoils - - - - 100663322 - System.Byte SharpModbus.ModbusF01ReadCoils::get_Slave() - - - - - - - - - - - - 100663323 - System.UInt16 SharpModbus.ModbusF01ReadCoils::get_Address() - - - - - - - - - - - - 100663324 - System.UInt16 SharpModbus.ModbusF01ReadCoils::get_Count() - - - - - - - - - - - - 100663325 - System.Int32 SharpModbus.ModbusF01ReadCoils::get_RequestLength() - - - - - - - - - - - - 100663326 - System.Int32 SharpModbus.ModbusF01ReadCoils::get_ResponseLength() - - - - - - - - - - - - 100663327 - System.Void SharpModbus.ModbusF01ReadCoils::.ctor(System.Byte,System.UInt16,System.UInt16) - - - - - - - - - - - - - - - 100663328 - System.Void SharpModbus.ModbusF01ReadCoils::FillRequest(System.Byte[],System.Int32) - - - - - - - - - - - - - - - - - 100663329 - System.Object SharpModbus.ModbusF01ReadCoils::ParseResponse(System.Byte[],System.Int32) - - - - - - - - - - - - - - - - 100663330 - System.String SharpModbus.ModbusF01ReadCoils::ToString() - - - - - - - - - - - - - - SharpModbus.ModbusF03ReadHoldingRegisters - - - - 100663331 - System.Byte SharpModbus.ModbusF03ReadHoldingRegisters::get_Slave() - - - - - - - - - - - - 100663332 - System.UInt16 SharpModbus.ModbusF03ReadHoldingRegisters::get_Address() - - - - - - - - - - - - 100663333 - System.UInt16 SharpModbus.ModbusF03ReadHoldingRegisters::get_Count() - - - - - - - - - - - - 100663334 - System.Int32 SharpModbus.ModbusF03ReadHoldingRegisters::get_RequestLength() - - - - - - - - - - - - 100663335 - System.Int32 SharpModbus.ModbusF03ReadHoldingRegisters::get_ResponseLength() - - - - - - - - - - - - 100663336 - System.Void SharpModbus.ModbusF03ReadHoldingRegisters::.ctor(System.Byte,System.UInt16,System.UInt16) - - - - - - - - - - - - - - - 100663337 - System.Void SharpModbus.ModbusF03ReadHoldingRegisters::FillRequest(System.Byte[],System.Int32) - - - - - - - - - - - - - - - - - 100663338 - System.Object SharpModbus.ModbusF03ReadHoldingRegisters::ParseResponse(System.Byte[],System.Int32) - - - - - - - - - - - - - - - - 100663339 - System.String SharpModbus.ModbusF03ReadHoldingRegisters::ToString() - - - - - - - - - - - - - - SharpModbus.ModbusF04ReadInputRegisters - - - - 100663340 - System.Byte SharpModbus.ModbusF04ReadInputRegisters::get_Slave() - - - - - - - - - - - - 100663341 - System.UInt16 SharpModbus.ModbusF04ReadInputRegisters::get_Address() - - - - - - - - - - - - 100663342 - System.UInt16 SharpModbus.ModbusF04ReadInputRegisters::get_Count() - - - - - - - - - - - - 100663343 - System.Int32 SharpModbus.ModbusF04ReadInputRegisters::get_RequestLength() - - - - - - - - - - - - 100663344 - System.Int32 SharpModbus.ModbusF04ReadInputRegisters::get_ResponseLength() - - - - - - - - - - - - 100663345 - System.Void SharpModbus.ModbusF04ReadInputRegisters::.ctor(System.Byte,System.UInt16,System.UInt16) - - - - - - - - - - - - - - - 100663346 - System.Void SharpModbus.ModbusF04ReadInputRegisters::FillRequest(System.Byte[],System.Int32) - - - - - - - - - - - - - - - - - 100663347 - System.Object SharpModbus.ModbusF04ReadInputRegisters::ParseResponse(System.Byte[],System.Int32) - - - - - - - - - - - - - - - - 100663348 - System.String SharpModbus.ModbusF04ReadInputRegisters::ToString() - - - - - - - - - - - - - - SharpModbus.ModbusF05WriteCoil - - - - 100663349 - System.Byte SharpModbus.ModbusF05WriteCoil::get_Slave() - - - - - - - - - - - - 100663350 - System.UInt16 SharpModbus.ModbusF05WriteCoil::get_Address() - - - - - - - - - - - - 100663351 - System.Boolean SharpModbus.ModbusF05WriteCoil::get_Value() - - - - - - - - - - - - 100663352 - System.Int32 SharpModbus.ModbusF05WriteCoil::get_RequestLength() - - - - - - - - - - - - 100663353 - System.Int32 SharpModbus.ModbusF05WriteCoil::get_ResponseLength() - - - - - - - - - - - - 100663354 - System.Void SharpModbus.ModbusF05WriteCoil::.ctor(System.Byte,System.UInt16,System.Boolean) - - - - - - - - - - - - - - - 100663355 - System.Void SharpModbus.ModbusF05WriteCoil::FillRequest(System.Byte[],System.Int32) - - - - - - - - - - - - - - - - - 100663356 - System.Object SharpModbus.ModbusF05WriteCoil::ParseResponse(System.Byte[],System.Int32) - - - - - - - - - - - - - - - - - 100663357 - System.String SharpModbus.ModbusF05WriteCoil::ToString() - - - - - - - - - - - - - - SharpModbus.ModbusF06WriteRegister - - - - 100663358 - System.Byte SharpModbus.ModbusF06WriteRegister::get_Slave() - - - - - - - - - - - - 100663359 - System.UInt16 SharpModbus.ModbusF06WriteRegister::get_Address() - - - - - - - - - - - - 100663360 - System.UInt16 SharpModbus.ModbusF06WriteRegister::get_Value() - - - - - - - - - - - - 100663361 - System.Int32 SharpModbus.ModbusF06WriteRegister::get_RequestLength() - - - - - - - - - - - - 100663362 - System.Int32 SharpModbus.ModbusF06WriteRegister::get_ResponseLength() - - - - - - - - - - - - 100663363 - System.Void SharpModbus.ModbusF06WriteRegister::.ctor(System.Byte,System.UInt16,System.UInt16) - - - - - - - - - - - - - - - 100663364 - System.Void SharpModbus.ModbusF06WriteRegister::FillRequest(System.Byte[],System.Int32) - - - - - - - - - - - - - - - - - 100663365 - System.Object SharpModbus.ModbusF06WriteRegister::ParseResponse(System.Byte[],System.Int32) - - - - - - - - - - - - - - - - 100663366 - System.String SharpModbus.ModbusF06WriteRegister::ToString() - - - - - - - - - - - - - - SharpModbus.ModbusF15WriteCoils - - - - 100663367 - System.Byte SharpModbus.ModbusF15WriteCoils::get_Slave() - - - - - - - - - - - - 100663368 - System.UInt16 SharpModbus.ModbusF15WriteCoils::get_Address() - - - - - - - - - - - - 100663369 - System.Boolean[] SharpModbus.ModbusF15WriteCoils::get_Values() - - - - - - - - - - - - 100663370 - System.Int32 SharpModbus.ModbusF15WriteCoils::get_RequestLength() - - - - - - - - - - - - 100663371 - System.Int32 SharpModbus.ModbusF15WriteCoils::get_ResponseLength() - - - - - - - - - - - - 100663372 - System.Void SharpModbus.ModbusF15WriteCoils::.ctor(System.Byte,System.UInt16,System.Boolean[]) - - - - - - - - - - - - - - - 100663373 - System.Void SharpModbus.ModbusF15WriteCoils::FillRequest(System.Byte[],System.Int32) - - - - - - - - - - - - - - - - - - - - 100663374 - System.Object SharpModbus.ModbusF15WriteCoils::ParseResponse(System.Byte[],System.Int32) - - - - - - - - - - - - - - - - 100663375 - System.String SharpModbus.ModbusF15WriteCoils::ToString() - - - - - - - - - - - - - - SharpModbus.ModbusF16WriteRegisters - - - - 100663376 - System.Byte SharpModbus.ModbusF16WriteRegisters::get_Slave() - - - - - - - - - - - - 100663377 - System.UInt16 SharpModbus.ModbusF16WriteRegisters::get_Address() - - - - - - - - - - - - 100663378 - System.UInt16[] SharpModbus.ModbusF16WriteRegisters::get_Values() - - - - - - - - - - - - 100663379 - System.Int32 SharpModbus.ModbusF16WriteRegisters::get_RequestLength() - - - - - - - - - - - - 100663380 - System.Int32 SharpModbus.ModbusF16WriteRegisters::get_ResponseLength() - - - - - - - - - - - - 100663381 - System.Void SharpModbus.ModbusF16WriteRegisters::.ctor(System.Byte,System.UInt16,System.UInt16[]) - - - - - - - - - - - - - - - 100663382 - System.Void SharpModbus.ModbusF16WriteRegisters::FillRequest(System.Byte[],System.Int32) - - - - - - - - - - - - - - - - - - - - 100663383 - System.Object SharpModbus.ModbusF16WriteRegisters::ParseResponse(System.Byte[],System.Int32) - - - - - - - - - - - - - - - - 100663384 - System.String SharpModbus.ModbusF16WriteRegisters::ToString() - - - - - - - - - - - - - - SharpModbus.ModbusHelper - - - - 100663385 - System.UInt16 SharpModbus.ModbusHelper::CRC16(System.Byte[],System.Int32,System.Int32) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100663386 - System.Byte SharpModbus.ModbusHelper::EncodeBool(System.Boolean) - - - - - - - - - - - - - - - 100663387 - System.Boolean SharpModbus.ModbusHelper::DecodeBool(System.Byte) - - - - - - - - - - - - 100663388 - System.Byte[] SharpModbus.ModbusHelper::EncodeBools(System.Boolean[]) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100663389 - System.Byte[] SharpModbus.ModbusHelper::EncodeWords(System.UInt16[]) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100663390 - System.Boolean[] SharpModbus.ModbusHelper::DecodeBools(System.Byte[],System.Int32,System.UInt16) - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100663391 - System.UInt16[] SharpModbus.ModbusHelper::DecodeWords(System.Byte[],System.Int32,System.UInt16) - - - - - - - - - - - - - - - - - - - - - - 100663392 - System.Void SharpModbus.ModbusHelper::ByteToBools(System.Byte,System.Boolean[],System.Int32,System.Int32) - - - - - - - - - - - - - - - - - - 100663393 - System.UInt16 SharpModbus.ModbusHelper::BytesForWords(System.Int32) - - - - - - - - - - - - 100663394 - System.Byte SharpModbus.ModbusHelper::BytesForBools(System.Int32) - - - - - - - - - - - - - - - 100663395 - System.Byte SharpModbus.ModbusHelper::High(System.Int32) - - - - - - - - - - - - 100663396 - System.Byte SharpModbus.ModbusHelper::Low(System.Int32) - - - - - - - - - - - - 100663397 - System.UInt16 SharpModbus.ModbusHelper::GetUShort(System.Byte,System.Byte) - - - - - - - - - - - - 100663398 - System.UInt16 SharpModbus.ModbusHelper::GetUShort(System.Byte[],System.Int32) - - - - - - - - - - - - 100663399 - System.Void SharpModbus.ModbusHelper::Copy(System.Byte[],System.Int32,System.Byte[],System.Int32,System.Int32) - - - - - - - - - - - - - - - - - - 100663400 - System.Boolean[] SharpModbus.ModbusHelper::Clone(System.Boolean[]) - - - - - - - - - - - - - - - - - - - - 100663401 - System.UInt16[] SharpModbus.ModbusHelper::Clone(System.UInt16[]) - - - - - - - - - - - - - - - - - - - - - - SharpModbus.ModbusMaster - - - - 100663402 - System.Void SharpModbus.ModbusMaster::.ctor(SharpModbus.IModbusStream,SharpModbus.IModbusProtocol) - - - - - - - - - - - - - - 100663403 - System.Void SharpModbus.ModbusMaster::Dispose() - - - - - - - - - - - - 100663404 - System.Boolean SharpModbus.ModbusMaster::ReadCoil(System.Byte,System.UInt16) - - - - - - - - - - - - 100663405 - System.Boolean SharpModbus.ModbusMaster::ReadInput(System.Byte,System.UInt16) - - - - - - - - - - - - 100663406 - System.UInt16 SharpModbus.ModbusMaster::ReadInputRegister(System.Byte,System.UInt16) - - - - - - - - - - - - 100663407 - System.UInt16 SharpModbus.ModbusMaster::ReadHoldingRegister(System.Byte,System.UInt16) - - - - - - - - - - - - 100663408 - System.Boolean[] SharpModbus.ModbusMaster::ReadCoils(System.Byte,System.UInt16,System.UInt16) - - - - - - - - - - - - 100663409 - System.Boolean[] SharpModbus.ModbusMaster::ReadInputs(System.Byte,System.UInt16,System.UInt16) - - - - - - - - - - - - 100663410 - System.UInt16[] SharpModbus.ModbusMaster::ReadInputRegisters(System.Byte,System.UInt16,System.UInt16) - - - - - - - - - - - - 100663411 - System.UInt16[] SharpModbus.ModbusMaster::ReadHoldingRegisters(System.Byte,System.UInt16,System.UInt16) - - - - - - - - - - - - 100663412 - System.Void SharpModbus.ModbusMaster::WriteCoil(System.Byte,System.UInt16,System.Boolean) - - - - - - - - - - - - 100663413 - System.Void SharpModbus.ModbusMaster::WriteRegister(System.Byte,System.UInt16,System.UInt16) - - - - - - - - - - - - 100663414 - System.Void SharpModbus.ModbusMaster::WriteCoils(System.Byte,System.UInt16,System.Boolean[]) - - - - - - - - - - - - 100663415 - System.Void SharpModbus.ModbusMaster::WriteRegisters(System.Byte,System.UInt16,System.UInt16[]) - - - - - - - - - - - - 100663416 - System.Object SharpModbus.ModbusMaster::Execute(SharpModbus.IModbusCommand) - - - - - - - - - - - - - - - - - - - - SharpModbus.ModbusParser - - - - 100663417 - SharpModbus.IModbusCommand SharpModbus.ModbusParser::Parse(System.Byte[],System.Int32) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100663418 - SharpModbus.IModbusCommand SharpModbus.ModbusParser::Parse01(System.Byte,System.Byte,System.UInt16,System.Byte[],System.Int32) - - - - - - - - - - - - - 100663419 - SharpModbus.IModbusCommand SharpModbus.ModbusParser::Parse02(System.Byte,System.Byte,System.UInt16,System.Byte[],System.Int32) - - - - - - - - - - - - - 100663420 - SharpModbus.IModbusCommand SharpModbus.ModbusParser::Parse03(System.Byte,System.Byte,System.UInt16,System.Byte[],System.Int32) - - - - - - - - - - - - - 100663421 - SharpModbus.IModbusCommand SharpModbus.ModbusParser::Parse04(System.Byte,System.Byte,System.UInt16,System.Byte[],System.Int32) - - - - - - - - - - - - - 100663422 - SharpModbus.IModbusCommand SharpModbus.ModbusParser::Parse05(System.Byte,System.Byte,System.UInt16,System.Byte[],System.Int32) - - - - - - - - - - - - - - - 100663423 - SharpModbus.IModbusCommand SharpModbus.ModbusParser::Parse06(System.Byte,System.Byte,System.UInt16,System.Byte[],System.Int32) - - - - - - - - - - - - - 100663424 - SharpModbus.IModbusCommand SharpModbus.ModbusParser::Parse15(System.Byte,System.Byte,System.UInt16,System.Byte[],System.Int32) - - - - - - - - - - - - - - - - 100663425 - SharpModbus.IModbusCommand SharpModbus.ModbusParser::Parse16(System.Byte,System.Byte,System.UInt16,System.Byte[],System.Int32) - - - - - - - - - - - - - - - - - - SharpModbus.ModbusRTUWrapper - - - - 100663426 - SharpModbus.IModbusCommand SharpModbus.ModbusRTUWrapper::get_Wrapped() - - - - - - - - - - - - 100663427 - System.Int32 SharpModbus.ModbusRTUWrapper::get_RequestLength() - - - - - - - - - - - - 100663428 - System.Int32 SharpModbus.ModbusRTUWrapper::get_ResponseLength() - - - - - - - - - - - - 100663429 - System.Void SharpModbus.ModbusRTUWrapper::.ctor(SharpModbus.IModbusCommand) - - - - - - - - - - - - - 100663430 - System.Void SharpModbus.ModbusRTUWrapper::FillRequest(System.Byte[],System.Int32) - - - - - - - - - - - - - - - 100663431 - System.Object SharpModbus.ModbusRTUWrapper::ParseResponse(System.Byte[],System.Int32) - - - - - - - - - - - - - - - 100663432 - System.String SharpModbus.ModbusRTUWrapper::ToString() - - - - - - - - - - - - - - SharpModbus.ModbusTCPScanner - - - - 100663433 - System.Void SharpModbus.ModbusTCPScanner::Append(System.Byte[],System.Int32,System.Int32) - - - - - - - - - - - - - - - - - - 100663434 - SharpModbus.IModbusCommand SharpModbus.ModbusTCPScanner::Scan() - - - - - - - - - - - - - - - - - - - - - - - - - - 100663435 - System.Void SharpModbus.ModbusTCPScanner::.ctor() - - - - - - - - - - - - - SharpModbus.ModbusTCPWrapper - - - - 100663436 - SharpModbus.IModbusCommand SharpModbus.ModbusTCPWrapper::get_Wrapped() - - - - - - - - - - - - 100663437 - System.Int32 SharpModbus.ModbusTCPWrapper::get_TransactionId() - - - - - - - - - - - - 100663438 - System.Int32 SharpModbus.ModbusTCPWrapper::get_RequestLength() - - - - - - - - - - - - 100663439 - System.Int32 SharpModbus.ModbusTCPWrapper::get_ResponseLength() - - - - - - - - - - - - 100663440 - System.Void SharpModbus.ModbusTCPWrapper::.ctor(SharpModbus.IModbusCommand,System.Int32) - - - - - - - - - - - - - - 100663441 - System.Void SharpModbus.ModbusTCPWrapper::FillRequest(System.Byte[],System.Int32) - - - - - - - - - - - - - - - - - - 100663442 - System.Object SharpModbus.ModbusTCPWrapper::ParseResponse(System.Byte[],System.Int32) - - - - - - - - - - - - - - - 100663443 - System.String SharpModbus.ModbusTCPWrapper::ToString() - - - - - - - - - - - - - - SharpModbus.ModbusRTUProtocol - - - - 100663444 - SharpModbus.IModbusWrapper SharpModbus.ModbusRTUProtocol::Wrap(SharpModbus.IModbusCommand) - - - - - - - - - - - - 100663445 - SharpModbus.IModbusWrapper SharpModbus.ModbusRTUProtocol::Parse(System.Byte[],System.Int32) - - - - - - - - - - - - - - - - 100663446 - System.Void SharpModbus.ModbusRTUProtocol::.ctor() - - - - - - - - - SharpModbus.SerialModbusStream - - - - 100663447 - System.Void SharpModbus.SerialModbusStream::.ctor(System.IO.Ports.SerialPort,System.Int32,System.Action`3<System.Char,System.Byte[],System.Int32>) - - - - - - - - - - - - - - - - 100663448 - System.Void SharpModbus.SerialModbusStream::Dispose() - - - - - - - - - - - - 100663449 - System.Void SharpModbus.SerialModbusStream::Write(System.Byte[]) - - - - - - - - - - - - - - - - - 100663450 - System.Void SharpModbus.SerialModbusStream::Read(System.Byte[]) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SharpModbus.SocketModbusStream - - - - 100663451 - System.Void SharpModbus.SocketModbusStream::.ctor(System.Net.Sockets.TcpClient,System.Int32,System.Action`3<System.Char,System.Byte[],System.Int32>) - - - - - - - - - - - - - - - - 100663452 - System.Void SharpModbus.SocketModbusStream::Dispose() - - - - - - - - - - - - 100663453 - System.Void SharpModbus.SocketModbusStream::Write(System.Byte[]) - - - - - - - - - - - - - - - - - 100663454 - System.Void SharpModbus.SocketModbusStream::Read(System.Byte[]) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SharpModbus.ModbusTCPProtocol - - - - 100663455 - System.Int32 SharpModbus.ModbusTCPProtocol::get_TransactionId() - - - - - - - - - - - - 100663456 - SharpModbus.IModbusWrapper SharpModbus.ModbusTCPProtocol::Wrap(SharpModbus.IModbusCommand) - - - - - - - - - - - - 100663457 - SharpModbus.IModbusWrapper SharpModbus.ModbusTCPProtocol::Parse(System.Byte[],System.Int32) - - - - - - - - - - - - - - - 100663458 - System.Void SharpModbus.ModbusTCPProtocol::.ctor() - - - - - - - - - - - - - \ No newline at end of file diff --git a/SharpModbusTest/Properties/AssemblyInfo.cs b/SharpModbusTest/Properties/AssemblyInfo.cs deleted file mode 100644 index 1dda02a..0000000 --- a/SharpModbusTest/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,31 +0,0 @@ -#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("SharpModbusTest")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Samuel Ventura")] -[assembly: AssemblyProduct("SharpModbusTest")] -[assembly: AssemblyCopyright("Copyright 2017 Samuel Ventura")] -[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("1.0.*")] diff --git a/SharpModbusTest/SharpModbusTest.csproj b/SharpModbusTest/SharpModbusTest.csproj index 22b85aa..cf46559 100644 --- a/SharpModbusTest/SharpModbusTest.csproj +++ b/SharpModbusTest/SharpModbusTest.csproj @@ -1,62 +1,15 @@ - - + + - {A0C3A91A-92B8-42DD-8E89-3CF8ECA79B1D} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Debug - AnyCPU - Library - SharpModbusTest - SharpModbusTest - v4.0 - Properties + net451 - - AnyCPU - - - bin\Debug\ - True - Full - False - True - DEBUG;TRACE - - - bin\Release\ - False - None - True - False - TRACE - - - - $(SharpDevelopBinPath)\Tools\NUnit\NUnit.Framework.dll - - - - 3.5 - - - - 3.5 - - - - - - - - - - - + - {9682c3a4-4703-417c-b29c-d68afbd97ec6} - SharpModbus - + + + + - - \ No newline at end of file + +