diff --git a/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs b/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs index d03f705..b08d16d 100644 --- a/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs +++ b/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs @@ -47,7 +47,7 @@ namespace ModbusDriver } } - private int _timeOut; + private int _timeOut = 1000; public int TimeOut { get { return _timeOut; } @@ -79,6 +79,7 @@ namespace ModbusDriver { if (_serialPort == null) _serialPort = new SerialPort(_port); + if (_timeOut <= 0) _timeOut = 1000; _serialPort.ReadTimeout = _timeOut; _serialPort.WriteTimeout = _timeOut; _serialPort.BaudRate = _baudRate; diff --git a/SCADA/Program/ModbusDriver/ModbusTCPDriver.cs b/SCADA/Program/ModbusDriver/ModbusTCPDriver.cs index 7723f3b..5930e6d 100644 --- a/SCADA/Program/ModbusDriver/ModbusTCPDriver.cs +++ b/SCADA/Program/ModbusDriver/ModbusTCPDriver.cs @@ -107,7 +107,7 @@ namespace ModbusDriver } #endregion - private int _timeout; + private int _timeout = 1000; private Socket tcpSynCl; private byte[] tcpSynClBuffer = new byte[0xFF]; @@ -180,6 +180,7 @@ namespace ModbusDriver //IPAddress ip = IPAddress.Parse(_ip); // ---------------------------------------------------------------- // Connect synchronous client + if (_timeout <= 0) _timeout = 1000; tcpSynCl = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); tcpSynCl.SendTimeout = _timeout; tcpSynCl.ReceiveTimeout = _timeout; diff --git a/SCADA/Program/SiemensPLCDriver/SiemensPLCDriver.cs b/SCADA/Program/SiemensPLCDriver/SiemensPLCDriver.cs index 91accf3..c382367 100644 --- a/SCADA/Program/SiemensPLCDriver/SiemensPLCDriver.cs +++ b/SCADA/Program/SiemensPLCDriver/SiemensPLCDriver.cs @@ -45,7 +45,7 @@ namespace SiemensPLCDriver } } - int _timeOut; + int _timeOut = 1000; public int TimeOut { get diff --git a/SCADA/dll/ModbusDriver.dll b/SCADA/dll/ModbusDriver.dll index c780341..f7db08d 100644 Binary files a/SCADA/dll/ModbusDriver.dll and b/SCADA/dll/ModbusDriver.dll differ diff --git a/SCADA/dll/SiemensPLCDriver.dll b/SCADA/dll/SiemensPLCDriver.dll index 0965929..10dc600 100644 Binary files a/SCADA/dll/SiemensPLCDriver.dll and b/SCADA/dll/SiemensPLCDriver.dll differ