Bump version to v1.4.1

* Clear modbus retained

Author: hung-eoh

library.json

@@ -1,6 +1,6 @@
 {
   "name": "ERa",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "E-Ra by EoH. An IoT Market Enabler! It supports WiFi, Ethernet, Zigbee, Modbus, Serial. Works with boards like Arduino, ESP8266, ESP32, STM32, Raspberry Pi...",
   "keywords": "ERa, E-Ra, esp8266, esp32, stm32, raspberry-pi, http, mqtt, zigbee, modbus, sensors, control, device, smartphone, mobile, app, web, cloud, communication, protocol, iot, wifi, ethernet, serial",
   "authors":

library.properties

@@ -1,5 +1,5 @@
 name=ERa
-version=1.4.0
+version=1.4.1
 author=EoH Ltd
 license=MIT
 maintainer=EoH Ltd <[email protected]>

linux/main.py

@@ -19,9 +19,9 @@
 
 ERA_MAJOR = 1
 ERA_MINOR = 4
-ERA_PATCH = 0
-ERA_VERSION = "1.4.0"
-ERA_FIRMWARE_VERSION = "1.4.0"
+ERA_PATCH = 1
+ERA_VERSION = "1.4.1"
+ERA_FIRMWARE_VERSION = "1.4.1"
 
 BUTTON_GPIO = 16
 

src/ERa/ERaApi.hpp

@@ -454,6 +454,10 @@ class ERaApi
 #endif
     }
 
+    void configIdRemove(ERaInt_t configId) {
+        this->thisProto().removeRetainedConfigIdData(configId);
+    }
+
 #if defined(ERA_MODBUS)
     void modbusDataWrite(ERaDataBuff* value) {
 #if ERA_MAX_EVENTS
@@ -468,6 +472,10 @@ class ERaApi
         this->thisProto().sendCommand(rsp, value);
 #endif
     }
+
+    void modbusDataRemove() {
+        this->thisProto().removeRetainedModbusData();
+    }
 #endif
 
 #if defined(ERA_ZIGBEE)

src/ERa/ERaProtocol.hpp

@@ -271,6 +271,7 @@ class ERaProto
     bool sendChangeResultWiFi(const char* payload);
     bool publishData(const char* prefixTopic, const char* payload,
                             bool retained, bool extended = false);
+    bool removeRetainedData(const char* prefixTopic);
     bool isConfigMode();
     void onConnected();
     void onDisconnected();
@@ -322,7 +323,9 @@ class ERaProto
     void sendCommandVirtual(ERaRsp_t& rsp, ERaDataJson* data);
 #if defined(ERA_MODBUS)
     void sendCommandModbus(ERaRsp_t& rsp, ERaDataBuff* data);
+    void removeRetainedModbusData();
 #endif
+    void removeRetainedConfigIdData(ERaInt_t configId);
 
     void processRequest(const char* topic, const char* payload);
 #if !defined(ERA_HAS_FUNCTIONAL_H)
@@ -1020,6 +1023,11 @@ bool ERaProto<Transp, Flash>::publishData(const char* prefixTopic, const char* p
     return this->transp.publishData(topic, payload, retained);
 }
 
+template <class Transp, class Flash>
+bool ERaProto<Transp, Flash>::removeRetainedData(const char* prefixTopic) {
+    return this->publishData(prefixTopic, "", true);
+}
+
 template <class Transp, class Flash>
 bool ERaProto<Transp, Flash>::sendListWiFi(const char* payload) {
     return this->publishData(ERA_PUB_PREFIX_LIST_WIFI_TOPIC,
@@ -1640,8 +1648,21 @@ void ERaProto<Transp, Flash>::sendCommandVirtual(ERaRsp_t& rsp, ERaDataJson* dat
         cJSON_Delete(root);
         root = nullptr;
     }
+
+    template <class Transp, class Flash>
+    void ERaProto<Transp, Flash>::removeRetainedModbusData() {
+        this->removeRetainedData(ERA_PUB_PREFIX_MODBUS_DATA_TOPIC);
+    }
 #endif
 
+template <class Transp, class Flash>
+void ERaProto<Transp, Flash>::removeRetainedConfigIdData(ERaInt_t configId) {
+    char topicName[MAX_TOPIC_LENGTH] {0};
+    FormatString(topicName, this->ERA_TOPIC);
+    FormatString(topicName, ERA_PUB_PREFIX_CONFIG_DATA_TOPIC, configId);
+    this->transp.publishData(topicName, "", true);
+}
+
 template <class Transp, class Flash>
 size_t ERaProto<Transp, Flash>::splitString(char* strInput, const char* delims) {
     if ((strInput == nullptr) ||

src/ERa/ERaVersion.hpp

@@ -3,7 +3,7 @@
 
 #define ERA_MAJOR                   1
 #define ERA_MINOR                   4
-#define ERA_PATCH                   0
+#define ERA_PATCH                   1
 
 #define ERA_VERSION_TO_STR_2(val)   # val
 #define ERA_VERSION_TO_STR(val)     ERA_VERSION_TO_STR_2(val)
@@ -17,7 +17,7 @@
 #define ERA_VERSION                 ERA_VERSION_TO_STR(ERA_MAJOR) "."   \
                                     ERA_VERSION_TO_STR(ERA_MINOR) "."   \
                                     ERA_VERSION_TO_STR(ERA_PATCH)
-#define ERA_VERSION_1_4_0
+#define ERA_VERSION_1_4_1
 
 #if !defined(ERA_FIRMWARE_VERSION)
     #define ERA_FIRMWARE_VERSION    ERA_VERSION

src/Modbus/ERaModbus.hpp

@@ -290,6 +290,10 @@ class ERaModbus
         this->thisApi().configIdWrite(configId, value);
     }
 
+    void configIdModbusRemove(ERaInt_t configId) override {
+        this->thisApi().configIdRemove(configId);
+    }
+
     void clearDataBuff() {
         this->dataBuff.clearBuffer();
     }
@@ -413,6 +417,13 @@ class ERaModbus
             this->modbusConfig->resize();
             this->modbusControl->resize();
             this->initModbus(true);
+            ERaDelay(500);
+            if (ModbusTransp::isNewReport()) {
+                this->thisApi().modbusDataRemove();
+            }
+            else {
+                ModbusTransp::removeConfigId();
+            }
         }
         ModbusState::set(ModbusStateT::STATE_MB_RUNNING);
     }

src/Modbus/ERaModbusData.hpp

@@ -273,6 +273,7 @@ class ERaModbusData
         return this->enableReport;
     }
 
+    void removeConfigId();
     void updateRegister();
     void parseConfig(const void* ptr, bool json);
     void processParseParamConvertAi(const cJSON* const root, iterator& it);
@@ -288,6 +289,11 @@ class ERaModbusData
         ERA_LOG_WARNING(TAG, ERA_PSTR("configIdModbusWrite default."));
     }
 
+    virtual void configIdModbusRemove(ERaInt_t configId) {
+        ERA_FORCE_UNUSED(configId);
+        ERA_LOG_WARNING(TAG, ERA_PSTR("configIdModbusRemove default."));
+    }
+
 private:
     iterator addInternalRegister(ERaInt_t configId, uint8_t addr, uint8_t func, uint16_t reg) {
         return this->addInternalRegister(configId, addr, func, HI_WORD(reg), LO_WORD(reg));
@@ -328,6 +334,7 @@ class ERaModbusData
     }
 
     ERaList<Register_t*> ERaReg;
+    ERaList<ERaInt_t> ERaRegId;
     ERaReport ERaRegRp;
     unsigned int numRegister;
 
@@ -387,6 +394,7 @@ ERaModbusData::Register_t* ERaModbusData::setupRegister(WrapperBase* value, uint
 
 inline
 void ERaModbusData::updateRegister() {
+    this->ERaRegId.clear();
     Register_t* pReg = nullptr;
     ModbusDataIterator* next = nullptr;
     const ModbusDataIterator* e = this->ERaReg.end();
@@ -399,6 +407,7 @@ void ERaModbusData::updateRegister() {
         if (!pReg->configId) {
             continue;
         }
+        this->ERaRegId.put(pReg->configId);
         if (pReg->value != nullptr) {
             delete pReg->value;
             pReg->value = nullptr;
@@ -616,6 +625,19 @@ bool ERaModbusData::handler(ERaModbusRequest* request, ERaModbusResponse* respon
     return found;
 }
 
+inline
+void ERaModbusData::removeConfigId() {
+    const ERaList<ERaInt_t>::iterator* e = this->ERaRegId.end();
+    for (ERaList<ERaInt_t>::iterator* it = this->ERaRegId.begin(); it != e; it = it->getNext()) {
+        ERaInt_t configId = it->get();
+        if (!configId) {
+            continue;
+        }
+        this->configIdModbusRemove(configId);
+    }
+    this->ERaRegId.clear();
+}
+
 inline
 bool ERaModbusData::handlerBits(ERaModbusRequest* request, ERaModbusResponse* response, bool success) {
     bool found {false};