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:39:14 +08:00
parent cfc2c489ff
commit c57fdb42ba
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,18 +148,18 @@ namespace Modbus.Net.Modbus
case ModbusType.Rtu: case ModbusType.Rtu:
{ {
Wrapper = ConnectionString == null Wrapper = ConnectionString == null
? new ModbusRtuProtocal(SlaveAddress, MasterAddress) ? new ModbusRtuProtocol(SlaveAddress, MasterAddress)
: new ModbusRtuProtocal(ConnectionString, SlaveAddress, MasterAddress); : new ModbusRtuProtocol(ConnectionString, SlaveAddress, MasterAddress);
break; break;
} }
//Tcp协议 //Tcp协议
case ModbusType.Tcp: case ModbusType.Tcp:
{ {
Wrapper = ConnectionString == null Wrapper = ConnectionString == null
? new ModbusTcpProtocal(SlaveAddress, MasterAddress) ? new ModbusTcpProtocol(SlaveAddress, MasterAddress)
: (ConnectionStringPort == null : (ConnectionStringPort == null
? new ModbusTcpProtocal(ConnectionString, SlaveAddress, MasterAddress) ? new ModbusTcpProtocol(ConnectionString, SlaveAddress, MasterAddress)
: new ModbusTcpProtocal(ConnectionStringIp, ConnectionStringPort.Value, SlaveAddress, : new ModbusTcpProtocol(ConnectionStringIp, ConnectionStringPort.Value, SlaveAddress,
MasterAddress)); MasterAddress));
break; break;
} }
@@ -167,18 +167,18 @@ namespace Modbus.Net.Modbus
case ModbusType.Ascii: case ModbusType.Ascii:
{ {
Wrapper = ConnectionString == null Wrapper = ConnectionString == null
? new ModbusAsciiProtocal(SlaveAddress, MasterAddress) ? new ModbusAsciiProtocol(SlaveAddress, MasterAddress)
: new ModbusAsciiProtocal(ConnectionString, SlaveAddress, MasterAddress); : new ModbusAsciiProtocol(ConnectionString, SlaveAddress, MasterAddress);
break; break;
} }
//Rtu协议 //Rtu协议
case ModbusType.RtuInTcp: case ModbusType.RtuInTcp:
{ {
Wrapper = ConnectionString == null Wrapper = ConnectionString == null
? new ModbusRtuInTcpProtocal(SlaveAddress, MasterAddress) ? new ModbusRtuInTcpProtocol(SlaveAddress, MasterAddress)
: (ConnectionStringPort == null : (ConnectionStringPort == null
? new ModbusRtuInTcpProtocal(ConnectionString, SlaveAddress, MasterAddress) ? new ModbusRtuInTcpProtocol(ConnectionString, SlaveAddress, MasterAddress)
: new ModbusRtuInTcpProtocal(ConnectionStringIp, ConnectionStringPort.Value, SlaveAddress, : new ModbusRtuInTcpProtocol(ConnectionStringIp, ConnectionStringPort.Value, SlaveAddress,
MasterAddress)); MasterAddress));
break; break;
} }
@@ -186,10 +186,10 @@ namespace Modbus.Net.Modbus
case ModbusType.AsciiInTcp: case ModbusType.AsciiInTcp:
{ {
Wrapper = ConnectionString == null Wrapper = ConnectionString == null
? new ModbusAsciiInTcpProtocal(SlaveAddress, MasterAddress) ? new ModbusAsciiInTcpProtocol(SlaveAddress, MasterAddress)
: (ConnectionStringPort == null : (ConnectionStringPort == null
? new ModbusAsciiInTcpProtocal(ConnectionString, SlaveAddress, MasterAddress) ? new ModbusAsciiInTcpProtocol(ConnectionString, SlaveAddress, MasterAddress)
: new ModbusAsciiInTcpProtocal(ConnectionStringIp, ConnectionStringPort.Value, SlaveAddress, : new ModbusAsciiInTcpProtocol(ConnectionStringIp, ConnectionStringPort.Value, SlaveAddress,
MasterAddress)); MasterAddress));
break; break;
} }

6
Tests/Modbus.Net.PersistedTests/Modbus.Net.PersistedTests.csproj
View File

@@ -10,9 +10,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Modbus.Net.Modbus\Modbus.Net.Modbus.csproj" /> <ProjectReference Include="..\..\Modbus.Net\Modbus.Net.Modbus\Modbus.Net.Modbus.csproj" />
<ProjectReference Include="..\Modbus.Net.Siemens\Modbus.Net.Siemens.csproj" /> <ProjectReference Include="..\..\Modbus.Net\Modbus.Net.Siemens\Modbus.Net.Siemens.csproj" />
<ProjectReference Include="..\Modbus.Net\Modbus.Net.csproj" /> <ProjectReference Include="..\..\Modbus.Net\Modbus.Net\Modbus.Net.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>