luosheng/Modbus.Net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
parallelbgls
2017-12-26 16:31:29 +08:00
parent 038d0fde13
commit cfc2c489ff
10 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Modbus.Net/Modbus.Net.Modbus/ModbusAsciiInTcpProtocol.cs
View File

@@ -12,7 +12,7 @@ namespace Modbus.Net.Modbus
/// </summary> /// </summary>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
public ModbusAsciiInTcpProtocal(byte slaveAddress, byte masterAddress) public ModbusAsciiInTcpProtocol(byte slaveAddress, byte masterAddress)
: this(ConfigurationManager.AppSettings["IP"], slaveAddress, masterAddress) : this(ConfigurationManager.AppSettings["IP"], slaveAddress, masterAddress)
{ {
} }
@@ -23,7 +23,7 @@ namespace Modbus.Net.Modbus
/// <param name="ip">ip地址</param> /// <param name="ip">ip地址</param>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
public ModbusAsciiInTcpProtocal(string ip, byte slaveAddress, byte masterAddress) public ModbusAsciiInTcpProtocol(string ip, byte slaveAddress, byte masterAddress)
: base(slaveAddress, masterAddress) : base(slaveAddress, masterAddress)
{ {
ProtocolLinker = new ModbusAsciiInTcpProtocolLinker(ip, slaveAddress); ProtocolLinker = new ModbusAsciiInTcpProtocolLinker(ip, slaveAddress);
@@ -36,7 +36,7 @@ namespace Modbus.Net.Modbus
/// <param name="port">端口</param> /// <param name="port">端口</param>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
public ModbusAsciiInTcpProtocal(string ip, int port, byte slaveAddress, byte masterAddress) public ModbusAsciiInTcpProtocol(string ip, int port, byte slaveAddress, byte masterAddress)
: base(slaveAddress, masterAddress) : base(slaveAddress, masterAddress)
{ {
ProtocolLinker = new ModbusTcpProtocolLinker(ip, port); ProtocolLinker = new ModbusTcpProtocolLinker(ip, port);

4
Modbus.Net/Modbus.Net.Modbus/ModbusAsciiProtocol.cs
View File

@@ -12,7 +12,7 @@ namespace Modbus.Net.Modbus
/// </summary> /// </summary>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
public ModbusAsciiProtocal(byte slaveAddress, byte masterAddress) public ModbusAsciiProtocol(byte slaveAddress, byte masterAddress)
: this(ConfigurationManager.AppSettings["COM"], slaveAddress, masterAddress) : this(ConfigurationManager.AppSettings["COM"], slaveAddress, masterAddress)
{ {
} }
@@ -23,7 +23,7 @@ namespace Modbus.Net.Modbus
/// <param name="com">串口地址</param> /// <param name="com">串口地址</param>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
public ModbusAsciiProtocal(string com, byte slaveAddress, byte masterAddress) public ModbusAsciiProtocol(string com, byte slaveAddress, byte masterAddress)
: base(slaveAddress, masterAddress) : base(slaveAddress, masterAddress)
{ {
ProtocolLinker = new ModbusAsciiProtocolLinker(com, slaveAddress); ProtocolLinker = new ModbusAsciiProtocolLinker(com, slaveAddress);

2
Modbus.Net/Modbus.Net.Modbus/ModbusProtocol.cs
View File

@@ -98,7 +98,7 @@ namespace Modbus.Net.Modbus
/// </summary> /// </summary>
/// <param name="slaveAddress">从站地址</param> /// <param name="slaveAddress">从站地址</param>
/// <param name="masterAddress">主站地址</param> /// <param name="masterAddress">主站地址</param>
protected ModbusProtocal(byte slaveAddress, byte masterAddress) protected ModbusProtocol(byte slaveAddress, byte masterAddress)
: base(slaveAddress, masterAddress, Endian.BigEndianLsb) : base(slaveAddress, masterAddress, Endian.BigEndianLsb)
{ {
} }

6
Modbus.Net/Modbus.Net.Modbus/ModbusRtuInTcpProtocol.cs
View File

@@ -13,7 +13,7 @@ namespace Modbus.Net.Modbus
/// </summary> /// </summary>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
public ModbusRtuInTcpProtocal(byte slaveAddress, byte masterAddress) public ModbusRtuInTcpProtocol(byte slaveAddress, byte masterAddress)
: this(ConfigurationManager.AppSettings["IP"], slaveAddress, masterAddress) : this(ConfigurationManager.AppSettings["IP"], slaveAddress, masterAddress)
{ {
} }
@@ -24,7 +24,7 @@ namespace Modbus.Net.Modbus
/// <param name="ip">ip地址</param> /// <param name="ip">ip地址</param>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
public ModbusRtuInTcpProtocal(string ip, byte slaveAddress, byte masterAddress) public ModbusRtuInTcpProtocol(string ip, byte slaveAddress, byte masterAddress)
: base(slaveAddress, masterAddress) : base(slaveAddress, masterAddress)
{ {
ProtocolLinker = new ModbusTcpProtocolLinker(ip); ProtocolLinker = new ModbusTcpProtocolLinker(ip);
@@ -37,7 +37,7 @@ namespace Modbus.Net.Modbus
/// <param name="port">端口号</param> /// <param name="port">端口号</param>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
public ModbusRtuInTcpProtocal(string ip, int port, byte slaveAddress, byte masterAddress) public ModbusRtuInTcpProtocol(string ip, int port, byte slaveAddress, byte masterAddress)
: base(slaveAddress, masterAddress) : base(slaveAddress, masterAddress)
{ {
ProtocolLinker = new ModbusRtuInTcpProtocolLinker(ip, port); ProtocolLinker = new ModbusRtuInTcpProtocolLinker(ip, port);

4
Modbus.Net/Modbus.Net.Modbus/ModbusRtuProtocol.cs
View File

@@ -12,7 +12,7 @@ namespace Modbus.Net.Modbus
/// </summary> /// </summary>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
public ModbusRtuProtocal(byte slaveAddress, byte masterAddress) public ModbusRtuProtocol(byte slaveAddress, byte masterAddress)
: this(ConfigurationManager.AppSettings["COM"], slaveAddress, masterAddress) : this(ConfigurationManager.AppSettings["COM"], slaveAddress, masterAddress)
{ {
} }
@@ -23,7 +23,7 @@ namespace Modbus.Net.Modbus
/// <param name="com">串口</param> /// <param name="com">串口</param>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
public ModbusRtuProtocal(string com, byte slaveAddress, byte masterAddress) public ModbusRtuProtocol(string com, byte slaveAddress, byte masterAddress)
: base(slaveAddress, masterAddress) : base(slaveAddress, masterAddress)
{ {
ProtocolLinker = new ModbusRtuProtocolLinker(com, slaveAddress); ProtocolLinker = new ModbusRtuProtocolLinker(com, slaveAddress);

6
Modbus.Net/Modbus.Net.Modbus/ModbusTcpProtocol.cs
View File

@@ -12,7 +12,7 @@ namespace Modbus.Net.Modbus
/// </summary> /// </summary>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
public ModbusTcpProtocal(byte slaveAddress, byte masterAddress) public ModbusTcpProtocol(byte slaveAddress, byte masterAddress)
: this(ConfigurationManager.AppSettings["IP"], slaveAddress, masterAddress) : this(ConfigurationManager.AppSettings["IP"], slaveAddress, masterAddress)
{ {
} }
@@ -23,7 +23,7 @@ namespace Modbus.Net.Modbus
/// <param name="ip">ip地址</param> /// <param name="ip">ip地址</param>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
public ModbusTcpProtocal(string ip, byte slaveAddress, byte masterAddress) public ModbusTcpProtocol(string ip, byte slaveAddress, byte masterAddress)
: base(slaveAddress, masterAddress) : base(slaveAddress, masterAddress)
{ {
ProtocolLinker = new ModbusTcpProtocolLinker(ip); ProtocolLinker = new ModbusTcpProtocolLinker(ip);
@@ -36,7 +36,7 @@ namespace Modbus.Net.Modbus
/// <param name="port">端口</param> /// <param name="port">端口</param>
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
/// <param name="masterAddress">主站号</param> /// <param name="masterAddress">主站号</param>
public ModbusTcpProtocal(string ip, int port, byte slaveAddress, byte masterAddress) public ModbusTcpProtocol(string ip, int port, byte slaveAddress, byte masterAddress)
: base(slaveAddress, masterAddress) : base(slaveAddress, masterAddress)
{ {
ProtocolLinker = new ModbusTcpProtocolLinker(ip, port); ProtocolLinker = new ModbusTcpProtocolLinker(ip, port);

26
Modbus.Net/Modbus.Net.Modbus/ModbusUtility.cs
View File

@@ -148,49 +148,49 @@ namespace Modbus.Net.Modbus
case ModbusType.Rtu: case ModbusType.Rtu:
{ {
Wrapper = ConnectionString == null Wrapper = ConnectionString == null
? new ModbusRtuProtocal(SlaveAddress, MasterAddress, Endian) ? new ModbusRtuProtocal(SlaveAddress, MasterAddress)
: new ModbusRtuProtocal(ConnectionString, SlaveAddress, MasterAddress, Endian); : new ModbusRtuProtocal(ConnectionString, SlaveAddress, MasterAddress);
break; break;
} }
//Tcp协议 //Tcp协议
case ModbusType.Tcp: case ModbusType.Tcp:
{ {
Wrapper = ConnectionString == null Wrapper = ConnectionString == null
? new ModbusTcpProtocal(SlaveAddress, MasterAddress, Endian) ? new ModbusTcpProtocal(SlaveAddress, MasterAddress)
: (ConnectionStringPort == null : (ConnectionStringPort == null
? new ModbusTcpProtocal(ConnectionString, SlaveAddress, MasterAddress, Endian) ? new ModbusTcpProtocal(ConnectionString, SlaveAddress, MasterAddress)
: new ModbusTcpProtocal(ConnectionStringIp, ConnectionStringPort.Value, SlaveAddress, : new ModbusTcpProtocal(ConnectionStringIp, ConnectionStringPort.Value, SlaveAddress,
MasterAddress, Endian)); MasterAddress));
break; break;
} }
//Ascii协议 //Ascii协议
case ModbusType.Ascii: case ModbusType.Ascii:
{ {
Wrapper = ConnectionString == null Wrapper = ConnectionString == null
? new ModbusAsciiProtocal(SlaveAddress, MasterAddress, Endian) ? new ModbusAsciiProtocal(SlaveAddress, MasterAddress)
: new ModbusAsciiProtocal(ConnectionString, SlaveAddress, MasterAddress, Endian); : new ModbusAsciiProtocal(ConnectionString, SlaveAddress, MasterAddress);
break; break;
} }
//Rtu协议 //Rtu协议
case ModbusType.RtuInTcp: case ModbusType.RtuInTcp:
{ {
Wrapper = ConnectionString == null Wrapper = ConnectionString == null
? new ModbusRtuInTcpProtocal(SlaveAddress, MasterAddress, Endian) ? new ModbusRtuInTcpProtocal(SlaveAddress, MasterAddress)
: (ConnectionStringPort == null : (ConnectionStringPort == null
? new ModbusRtuInTcpProtocal(ConnectionString, SlaveAddress, MasterAddress, Endian) ? new ModbusRtuInTcpProtocal(ConnectionString, SlaveAddress, MasterAddress)
: new ModbusRtuInTcpProtocal(ConnectionStringIp, ConnectionStringPort.Value, SlaveAddress, : new ModbusRtuInTcpProtocal(ConnectionStringIp, ConnectionStringPort.Value, SlaveAddress,
MasterAddress, Endian)); MasterAddress));
break; break;
} }
//Ascii协议 //Ascii协议
case ModbusType.AsciiInTcp: case ModbusType.AsciiInTcp:
{ {
Wrapper = ConnectionString == null Wrapper = ConnectionString == null
? new ModbusAsciiInTcpProtocal(SlaveAddress, MasterAddress, Endian) ? new ModbusAsciiInTcpProtocal(SlaveAddress, MasterAddress)
: (ConnectionStringPort == null : (ConnectionStringPort == null
? new ModbusAsciiInTcpProtocal(ConnectionString, SlaveAddress, MasterAddress, Endian) ? new ModbusAsciiInTcpProtocal(ConnectionString, SlaveAddress, MasterAddress)
: new ModbusAsciiInTcpProtocal(ConnectionStringIp, ConnectionStringPort.Value, SlaveAddress, : new ModbusAsciiInTcpProtocal(ConnectionStringIp, ConnectionStringPort.Value, SlaveAddress,
MasterAddress, Endian)); MasterAddress));
break; break;
} }
} }

12
Modbus.Net/Modbus.Net.sln
View File

@@ -30,7 +30,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CrossLamp", "..\Samples\Cro
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnyType", "..\Samples\AnyType\AnyType.csproj", "{25FABD48-D82E-4E08-91A4-46F7057EC954}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnyType", "..\Samples\AnyType\AnyType.csproj", "{25FABD48-D82E-4E08-91A4-46F7057EC954}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Modbus.Net.PersistedTests", "Modbus.Net.PersistedTests\Modbus.Net.PersistedTests.csproj", "{5BFCA3D4-D809-485E-B69C-6F80A6A917D4}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modbus.Net.PersistedTests", "..\Tests\Modbus.Net.PersistedTests\Modbus.Net.PersistedTests.csproj", "{EC184EF4-81C4-4A4B-8763-79AC4150E613}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -74,10 +74,10 @@ Global
{25FABD48-D82E-4E08-91A4-46F7057EC954}.Debug|Any CPU.Build.0 = Debug|Any CPU {25FABD48-D82E-4E08-91A4-46F7057EC954}.Debug|Any CPU.Build.0 = Debug|Any CPU
{25FABD48-D82E-4E08-91A4-46F7057EC954}.Release|Any CPU.ActiveCfg = Release|Any CPU {25FABD48-D82E-4E08-91A4-46F7057EC954}.Release|Any CPU.ActiveCfg = Release|Any CPU
{25FABD48-D82E-4E08-91A4-46F7057EC954}.Release|Any CPU.Build.0 = Release|Any CPU {25FABD48-D82E-4E08-91A4-46F7057EC954}.Release|Any CPU.Build.0 = Release|Any CPU
{5BFCA3D4-D809-485E-B69C-6F80A6A917D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EC184EF4-81C4-4A4B-8763-79AC4150E613}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5BFCA3D4-D809-485E-B69C-6F80A6A917D4}.Debug|Any CPU.Build.0 = Debug|Any CPU {EC184EF4-81C4-4A4B-8763-79AC4150E613}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5BFCA3D4-D809-485E-B69C-6F80A6A917D4}.Release|Any CPU.ActiveCfg = Release|Any CPU {EC184EF4-81C4-4A4B-8763-79AC4150E613}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5BFCA3D4-D809-485E-B69C-6F80A6A917D4}.Release|Any CPU.Build.0 = Release|Any CPU {EC184EF4-81C4-4A4B-8763-79AC4150E613}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@@ -88,7 +88,7 @@ Global
{2D939825-8459-438A-AC82-4C67A73E373E} = {145DA93A-6768-4D98-8512-AB22339933F7} {2D939825-8459-438A-AC82-4C67A73E373E} = {145DA93A-6768-4D98-8512-AB22339933F7}
{41F40C27-AB1A-4153-BBAD-BFC7BD57B380} = {145DA93A-6768-4D98-8512-AB22339933F7} {41F40C27-AB1A-4153-BBAD-BFC7BD57B380} = {145DA93A-6768-4D98-8512-AB22339933F7}
{25FABD48-D82E-4E08-91A4-46F7057EC954} = {145DA93A-6768-4D98-8512-AB22339933F7} {25FABD48-D82E-4E08-91A4-46F7057EC954} = {145DA93A-6768-4D98-8512-AB22339933F7}
{5BFCA3D4-D809-485E-B69C-6F80A6A917D4} = {D8DD32FC-CF39-4A1A-8FBF-9E82C5278C34} {EC184EF4-81C4-4A4B-8763-79AC4150E613} = {D8DD32FC-CF39-4A1A-8FBF-9E82C5278C34}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {AF00D64E-3C70-474A-8A81-E9E48017C4B5} SolutionGuid = {AF00D64E-3C70-474A-8A81-E9E48017C4B5}

2
Modbus.Net/Modbus.Net.PersistedTests/Modbus.Net.PersistedTests.csproj → Tests/Modbus.Net.PersistedTests/Modbus.Net.PersistedTests.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFrameworks>net45; netcoreapp2.0</TargetFrameworks> <TargetFrameworks>net45</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

0
Modbus.Net/Modbus.Net.PersistedTests/Program.cs → Tests/Modbus.Net.PersistedTests/Program.cs
View File