This commit is contained in:
parallelbgls
2017-09-26 11:26:58 +08:00
parent 43a2ecd43b
commit 0fd8871ee4

View File

@@ -173,7 +173,10 @@ namespace Modbus.Net.Modbus
{ {
Wrapper = ConnectionString == null Wrapper = ConnectionString == null
? new ModbusRtuInTcpProtocal(SlaveAddress, MasterAddress, Endian) ? new ModbusRtuInTcpProtocal(SlaveAddress, MasterAddress, Endian)
: new ModbusRtuInTcpProtocal(ConnectionString, SlaveAddress, MasterAddress, Endian); : (ConnectionStringPort == null
? new ModbusRtuInTcpProtocal(ConnectionString, SlaveAddress, MasterAddress, Endian)
: new ModbusRtuInTcpProtocal(ConnectionStringIp, ConnectionStringPort.Value, SlaveAddress,
MasterAddress, Endian));
break; break;
} }
//Ascii协议 //Ascii协议
@@ -181,7 +184,10 @@ namespace Modbus.Net.Modbus
{ {
Wrapper = ConnectionString == null Wrapper = ConnectionString == null
? new ModbusAsciiInTcpProtocal(SlaveAddress, MasterAddress, Endian) ? new ModbusAsciiInTcpProtocal(SlaveAddress, MasterAddress, Endian)
: new ModbusAsciiInTcpProtocal(ConnectionString, SlaveAddress, MasterAddress, Endian); : (ConnectionStringPort == null
? new ModbusAsciiInTcpProtocal(ConnectionString, SlaveAddress, MasterAddress, Endian)
: new ModbusAsciiInTcpProtocal(ConnectionStringIp, ConnectionStringPort.Value, SlaveAddress,
MasterAddress, Endian));
break; break;
} }
} }