Disconnect initial implementation

Author: emelianov

src/Modbus.h

@@ -127,7 +127,8 @@ class Modbus {
             EX_DATA_MISMACH         = 0xE2, // Custom. Inpud data size mismach
             EX_UNEXPECTED_RESPONSE  = 0xE3, // Custom. Returned result doesn't mach transaction
             EX_TIMEOUT              = 0xE4, // Custom. Operation not finished within reasonable time
-            EX_CONNECTION_LOST      = 0xE5  // Custom. Connection with device lost
+            EX_CONNECTION_LOST      = 0xE5, // Custom. Connection with device lost
+            EX_CANCEL               = 0xE6  // Custom. Transaction/request canceled
         };
         ~Modbus();
         bool addHreg(uint16_t offset, uint16_t value = 0, uint16_t numregs = 1);

src/ModbusIP_ESP8266.cpp

@@ -142,8 +142,10 @@ void ModbusIP::task() {
  // Prepare and send ModbusIP frame. _frame buffer should be filled with Modbus data
 uint16_t ModbusIP::send(IPAddress ip, TAddress startreg, cbTransaction cb, uint8_t unit, void* data, bool waitResponse) {
 #ifdef MODBUSIP_MAX_TRANSACIONS
-	if (_trans.size() >= MODBUSIP_MAX_TRANSACIONS)
+	if (_trans.size() >= MODBUSIP_MAX_TRANSACIONS) {
+Serial.println(_trans.size());
 		return false;
+}
 #endif
 	int8_t p = getSlave(ip);
 	if (p == -1 || !client[p]->connected())
@@ -160,7 +162,8 @@ uint16_t ModbusIP::send(IPAddress ip, TAddress startreg, cbTransaction cb, uint8
 	memcpy(sbuf + sizeof(_MBAP.raw), _frame, _len);
 	if (client[p]->write(sbuf, send_len) != send_len)
 		return false;
-	if (waitResponse) {
+	client[p]->flush();
+	if (waitResponse || true) {
 		TTransaction tmp;
 		tmp.transactionId = transactionId;
 		tmp.timestamp = millis();
@@ -390,4 +393,13 @@ bool ModbusIP::isConnected(IPAddress ip) {
 
 void ModbusIP::autoConnect(bool enabled) {
 	autoConnectMode = enabled;
+}
+
+bool ModbusIP::disconnect(IPAddress ip) {
+	int8_t p = getSlave(ip);
+	if (p != -1) client[p]->stop();
+}
+
+void ModbusIP::dropTransactions() {
+	_trans.resize(0);
 }

src/ModbusIP_ESP8266.h

@@ -32,7 +32,7 @@ typedef struct TTransaction {
 	uint8_t*	_frame = nullptr;
 	void*		data = nullptr;
 	TAddress	startreg;
-    bool operator ==(const TTransaction &obj) const {
+	bool operator ==(const TTransaction &obj) const {
 		    return transactionId == obj.transactionId;
 	}
 };
@@ -70,7 +70,7 @@ class ModbusIP : public Modbus {
 	bool isTransaction(uint16_t id);
 	bool isConnected(IPAddress ip);
 	bool connect(IPAddress ip);
-	bool disconnect(IPAddress addr) {}  // Not implemented yet
+	bool disconnect(IPAddress ip);
 	void slave();
 	void master();
 	void task();
@@ -79,8 +79,9 @@ class ModbusIP : public Modbus {
 	void onDisconnect(cbModbusConnect cb = nullptr);
 	IPAddress eventSource();
 	void autoConnect(bool enabled = true);
+	void dropTransactions();
 
-    uint16_t writeCoil(IPAddress ip, uint16_t offset, bool value, cbTransaction cb = nullptr, uint8_t unit = MODBUSIP_UNIT);
+	uint16_t writeCoil(IPAddress ip, uint16_t offset, bool value, cbTransaction cb = nullptr, uint8_t unit = MODBUSIP_UNIT);
 	uint16_t writeHreg(IPAddress ip, uint16_t offset, uint16_t value, cbTransaction cb = nullptr, uint8_t unit = MODBUSIP_UNIT);
 	uint16_t writeCoil(IPAddress ip, uint16_t offset, bool* value, uint16_t numregs = 1, cbTransaction cb = nullptr, uint8_t unit = MODBUSIP_UNIT);
 	uint16_t writeHreg(IPAddress ip, uint16_t offset, uint16_t* value, uint16_t numregs = 1, cbTransaction cb = nullptr, uint8_t unit = MODBUSIP_UNIT);