Add setTimeout API for ModbusClient's

Author: sandeepmistry

keywords.txt

@@ -19,6 +19,7 @@ ModbusTCPServer	KEYWORD1
 begin	KEYWORD2
 poll	KEYWORD2
 end	KEYWORD2
+setTimeout	KEYWORD2
 
 beginTransmission	KEYWORD2
 write	KEYWORD2

src/ModbusClient.cpp

@@ -21,8 +21,9 @@
 
 #include "ModbusClient.h"
 
-ModbusClient::ModbusClient() :
+ModbusClient::ModbusClient(unsigned long defaultTimeout) :
   _mb(NULL),
+  _timeout(defaultTimeout),
   _defaultId(0x00),
   _transmissionBegun(false),
   _values(NULL),
@@ -68,6 +69,8 @@ int ModbusClient::begin(modbus_t* mb, int defaultId)
   _written = 0;
 
   modbus_set_error_recovery(_mb, MODBUS_ERROR_RECOVERY_PROTOCOL);
+  
+  setTimeout(_timeout);
 
   return 1;
 }
@@ -410,3 +413,12 @@ const char* ModbusClient::lastError()
 
   return modbus_strerror(errno); 
 }
+
+void ModbusClient::setTimeout(unsigned long ms)
+{
+  _timeout = ms;
+
+  if (_mb) {
+    modbus_set_response_timeout(_mb, _timeout / 1000, (_timeout % 1000) * 1000);
+  }
+}

src/ModbusClient.h

@@ -198,14 +198,20 @@ class ModbusClient {
    */
   void end();
 
+  /**
+   * Set response timeout (in milliseconds)
+   */
+  void setTimeout(unsigned long ms);
+
 protected:
-  ModbusClient();
+  ModbusClient(unsigned long defaultTimeout);
   virtual ~ModbusClient();
 
   int begin(modbus_t* _mb, int defaultId);
 
 private:
   modbus_t* _mb;
+  unsigned long _timeout;
   int _defaultId;
 
   bool _transmissionBegun;

src/ModbusRTUClient.cpp

@@ -26,7 +26,8 @@ extern "C" {
 
 #include "ModbusRTUClient.h"
 
-ModbusRTUClientClass::ModbusRTUClientClass()
+ModbusRTUClientClass::ModbusRTUClientClass() :
+  ModbusClient(1000)
 {
 }
 
@@ -42,8 +43,6 @@ int ModbusRTUClientClass::begin(unsigned long baudrate, uint16_t config)
     return 0;
   }
 
-  modbus_set_response_timeout(mb, 1, 0);
-
   return 1;
 }
 

src/ModbusTCPClient.cpp

@@ -27,6 +27,7 @@ extern "C" {
 #include "ModbusTCPClient.h"
 
 ModbusTCPClient::ModbusTCPClient(Client& client) :
+  ModbusClient(30 * 1000),
   _client(&client)
 {
 }
@@ -39,8 +40,6 @@ int ModbusTCPClient::begin(IPAddress ip, uint16_t port)
 {
   modbus_t* mb = modbus_new_tcp(_client, ip, port);
 
-  modbus_set_response_timeout(mb, 30, 0);
-
   return ModbusClient::begin(mb, MODBUS_TCP_SLAVE);
 }