set default of timeout

hahanonym · Dec 26, 2017 · dc91bcd · dc91bcd
1 parent 246bddb
commit dc91bcd
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs b/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs
@@ -47,7 +47,7 @@ public bool IsClosed
             }
         }
 
-        private int _timeOut;
+        private int _timeOut = 1000;
         public int TimeOut
         {
             get { return _timeOut; }
@@ -79,6 +79,7 @@ public bool Connect()
             {
                 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
@@ -107,7 +107,7 @@ public string GetAddress(DeviceAddress address)
         }
 
         #endregion
-        private int _timeout;
+        private int _timeout = 1000;
 
         private Socket tcpSynCl;
         private byte[] tcpSynClBuffer = new byte[0xFF];
@@ -180,6 +180,7 @@ public bool Connect()
                 //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
@@ -45,7 +45,7 @@ public int PDU
             }
         }
 
-        int _timeOut;
+        int _timeOut = 1000;
         public int TimeOut
         {
             get

diff --git a/SCADA/dll/ModbusDriver.dll b/SCADA/dll/ModbusDriver.dll
diff --git a/SCADA/dll/SiemensPLCDriver.dll b/SCADA/dll/SiemensPLCDriver.dll
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,7 +45,7 @@ public int PDU @@
                 }
             }
-            int _timeOut;
+            int _timeOut = 1000;
             public int TimeOut
             {
                 get
@@ Expand Down @@