makecoder
diff --git a/‎SCADA/Program/ModbusDriver/ModbusRTUDriver.cs
Lines changed: 2 additions & 1 deletion b/‎SCADA/Program/ModbusDriver/ModbusRTUDriver.cs
Lines changed: 2 additions & 1 deletion
diff --git a/‎SCADA/Program/ModbusDriver/ModbusTCPDriver.cs
Lines changed: 2 additions & 1 deletion b/‎SCADA/Program/ModbusDriver/ModbusTCPDriver.cs
Lines changed: 2 additions & 1 deletion
diff --git a/‎SCADA/Program/SiemensPLCDriver/SiemensPLCDriver.cs
Lines changed: 1 addition & 1 deletion b/‎SCADA/Program/SiemensPLCDriver/SiemensPLCDriver.cs
Lines changed: 1 addition & 1 deletion
diff --git a/‎SCADA/dll/ModbusDriver.dll
512 Bytes b/‎SCADA/dll/ModbusDriver.dll
512 Bytes
diff --git a/‎SCADA/dll/SiemensPLCDriver.dll
0 Bytes b/‎SCADA/dll/SiemensPLCDriver.dll
0 Bytes
@@ -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;
 
@@ -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;
 
@@ -45,7 +45,7 @@ public int PDU
             }
         }
 
-        int _timeOut;
+        int _timeOut = 1000;
         public int TimeOut
         {
             get
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public bool IsClosed`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`		`- private int _timeOut;`
	`50`	`+ private int _timeOut = 1000;`
`51`	`51`	`public int TimeOut`
`52`	`52`	`{`
`53`	`53`	`get { return _timeOut; }`
`@@ -79,6 +79,7 @@ public bool Connect()`
`79`	`79`	`{`
`80`	`80`	`if (_serialPort == null)`
`81`	`81`	`_serialPort = new SerialPort(_port);`
	`82`	`+ if (_timeOut <= 0) _timeOut = 1000;`
`82`	`83`	`_serialPort.ReadTimeout = _timeOut;`
`83`	`84`	`_serialPort.WriteTimeout = _timeOut;`
`84`	`85`	`_serialPort.BaudRate = _baudRate;`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public int PDU`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`- int _timeOut;`
	`48`	`+ int _timeOut = 1000;`
`49`	`49`	`public int TimeOut`
`50`	`50`	`{`
`51`	`51`	`get`