Merge branch 'master' of github.com:emelianov/modbus-esp8266

Author: emelianov

examples/TCP-Ethernet/client/client.ino

@@ -31,7 +31,7 @@ void setup() {
   Ethernet.init(5);         // SS pin
   Ethernet.begin(mac, ip);  // start the Ethernet connection
   delay(1000);              // give the Ethernet shield a second to initialize
-  mb.client();              // Act as Modbus TCP server
+  mb.client();              // Act as Modbus TCP client
 }
 
 uint16_t res = 0;
@@ -49,4 +49,4 @@ if (mb.isConnected(remote)) {   // Check if connection to Modbus Slave is establ
     showLast = millis();
     Serial.println(res);
   }
-}
+}

src/ModbusAPI.h

@@ -128,9 +128,9 @@ class ModbusAPI : public T {
 	uint16_t readWriteHreg(TYPEID slaveId, uint16_t readOffset, uint16_t* readValue, uint16_t readNumregs, uint16_t writeOffset, uint16_t* writeValue, uint16_t writeNumregs, cbTransaction cb = nullptr, uint8_t unit = MODBUSIP_UNIT);
 
 	template <typename TYPEID>
-	uint16_t rawRequest(TYPEID ip, uint8_t* data, uint16_t len, cbTransaction cb = nullptr, uint8_t unit = MODBUSIP_UNIT);
+	uint16_t rawRequest(TYPEID ip, const uint8_t* data, uint16_t len, cbTransaction cb = nullptr, uint8_t unit = MODBUSIP_UNIT);
 	template <typename TYPEID>
-	uint16_t rawResponce(TYPEID ip, uint8_t* data, uint16_t len, uint8_t unit = MODBUSIP_UNIT);
+	uint16_t rawResponce(TYPEID ip, const uint8_t* data, uint16_t len, uint8_t unit = MODBUSIP_UNIT);
 	template <typename TYPEID>
 	uint16_t errorResponce(TYPEID ip, Modbus::FunctionCode fn, Modbus::ResultCode excode, uint8_t unit = MODBUSIP_UNIT);
 };
@@ -475,7 +475,7 @@ uint16_t ModbusAPI<T>::readWriteHreg(TYPEID ip, \
 template <class T>
 template <typename TYPEID>
 uint16_t ModbusAPI<T>::rawRequest(TYPEID ip, \
-			uint8_t* data, uint16_t len,
+			const uint8_t* data, uint16_t len,
 			cbTransaction cb, uint8_t unit) {
 	free(this->_frame);
 	this->_frame = (uint8_t*)malloc(len);
@@ -489,7 +489,7 @@ uint16_t ModbusAPI<T>::rawRequest(TYPEID ip, \
 template <class T>
 template <typename TYPEID>
 uint16_t ModbusAPI<T>::rawResponce(TYPEID ip, \
-			uint8_t* data, uint16_t len, uint8_t unit) {
+			const uint8_t* data, uint16_t len, uint8_t unit) {
 	free(this->_frame);
 	this->_frame = (uint8_t*)malloc(len);
 	if (!this->_frame)

src/ModbusSettings.h

@@ -104,7 +104,9 @@ Otherwise IP addresses only must be used
 #define MODBUSRTU_BROADCAST 0
 #define MB_RESERVE 248
 #define MB_SERIAL_BUFFER 128
+#ifndef MODBUSRTU_TIMEOUT
 #define MODBUSRTU_TIMEOUT 1000
+#endif
 #define MODBUSRTU_MAX_READMS 100
 /*
 #define MODBUSRTU_REDE

src/ModbusTCPTemplate.h

@@ -227,7 +227,7 @@ void ModbusTCPTemplate<SERVER, CLIENT>::task() {
 				delete currentClient;
 				continue;
 			}
-#if defined(MODBUSRTU_DEBUG)
+#if defined(MODBUSIP_DEBUG)
 			Serial.println("IP: Connected");
 #endif
 			if (cbConnect == nullptr || cbConnect(currentClient->remoteIP())) {