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

Author: emelianov

README.md

@@ -70,7 +70,10 @@ http://www.modbus.org/docs/Modbus_over_serial_line_V1_02.pdf
 + added removeOnSetCoil\... methods
 + added read/write/push/pullCoil/Hreg/Ireg/Ists() parameter to specify Modbus unit id
 + added ability to auto connect to slave. Setting is global. Disabled by default.
-// ToDo for 2.0.1
+// 2.0.1
++ Fix readCoil\Hreg\Ists\Ireg not read value from slave
++ Fix cresh on disconnect with Arduino Core 2.5.x
+// ToDo for 2.0.2
 - modify examples
 - code cleanup
 // ToDo later

library.properties

@@ -1,5 +1,5 @@
 name=modbus-esp8266
-version=2.0
+version=2.0.1
 author=Andre Sarmento Barbosa
 maintainer=Alexander Emelianov<[email protected]>
 sentence=Modbus Master-Slave Library for ESP8266/ESP32

src/ModbusIP_ESP8266.cpp

@@ -257,7 +257,7 @@ uint16_t ModbusIP::writeCoil(IPAddress ip, uint16_t offset, bool* value, uint16_
 uint16_t ModbusIP::readCoil(IPAddress ip, uint16_t offset, bool* value, uint16_t numregs, cbTransaction cb, uint8_t unit) {
 	if (numregs < 0x0001 || numregs > 0x007B) return false;
 	readSlave(offset, numregs, FC_READ_COILS);
-	return send(ip, COIL(offset), cb, unit, value, cb);
+	return send(ip, COIL(offset), cb, unit, value);
 }
 
 uint16_t ModbusIP::writeHreg(IPAddress ip, uint16_t offset, uint16_t value, cbTransaction cb, uint8_t unit) {
@@ -274,19 +274,19 @@ uint16_t ModbusIP::writeHreg(IPAddress ip, uint16_t offset, uint16_t* value, uin
 uint16_t ModbusIP::readHreg(IPAddress ip, uint16_t offset, uint16_t* value, uint16_t numregs, cbTransaction cb, uint8_t unit) {
 	if (numregs < 0x0001 || numregs > 0x007B) return false;
 	readSlave(offset, numregs, FC_READ_REGS);
-	return send(ip, HREG(offset), cb, unit, value, cb);
+	return send(ip, HREG(offset), cb, unit, value);
 }
 
 uint16_t ModbusIP::readIsts(IPAddress ip, uint16_t offset, bool* value, uint16_t numregs, cbTransaction cb, uint8_t unit) {
 	if (numregs < 0x0001 || numregs > 0x007B) return false;
 	readSlave(offset, numregs, FC_READ_INPUT_STAT);
-	return send(ip, ISTS(offset), cb, unit, value, cb);
+	return send(ip, ISTS(offset), cb, unit, value);
 }
 
 uint16_t ModbusIP::readIreg(IPAddress ip, uint16_t offset, uint16_t* value, uint16_t numregs, cbTransaction cb, uint8_t unit) {
 	if (numregs < 0x0001 || numregs > 0x007B) return false;
 	readSlave(offset, numregs, FC_READ_INPUT_REGS);
-	return send(ip, IREG(offset), cb, unit, value, cb);
+	return send(ip, IREG(offset), cb, unit, value);
 }
 
 uint16_t ModbusIP::pushCoil(IPAddress ip, uint16_t to, uint16_t from, uint16_t numregs, cbTransaction cb, uint8_t unit) {