Auto finalize modbus

linux/main.py

@@ -19,9 +19,9 @@
 
 ERA_MAJOR = 1
 ERA_MINOR = 5
-ERA_PATCH = 1
-ERA_VERSION = "1.5.1"
-ERA_FIRMWARE_VERSION = "1.5.1"
+ERA_PATCH = 2
+ERA_VERSION = "1.5.2"
+ERA_FIRMWARE_VERSION = "1.5.2"
 
 BUTTON_GPIO = 16
 

src/Automation/ERaHelpers.tpp

@@ -11,8 +11,9 @@ namespace eras {
         return true;
     }
 
-    Mutex::Mutex() {
-    }
+    Mutex::Mutex()
+        : mMutex(nullptr)
+    {}
 
     void Mutex::lock() {
         ERaGuardLock(this->mMutex);

src/Automation/ERaSmart.hpp

@@ -59,6 +59,7 @@ namespace eras {
         void run() override;
         void deleteAll() override;
         void updateValue(ERaUInt_t configID, double value, bool trigger = false) override;
+        bool isRunning() const override;
 
         static ERaSmart* getInstance() {
             return ERaSmart::instance();
@@ -157,6 +158,8 @@ namespace eras {
         std::vector<Smart*> mSmarts {};
 
         Mutex mLock;
+
+        bool mInitialized {false};
     };
 
 } /* namespace eras */

src/Automation/ERaSmart.tpp

@@ -13,6 +13,8 @@ namespace eras {
 
         this->calculateRunningComponents();
         this->calculateValueComponents();
+
+        this->mInitialized = true;
     }
 
     void ERaSmart::run() {
@@ -100,6 +102,10 @@ namespace eras {
         }
     }
 
+    bool ERaSmart::isRunning() const {
+        return (this->mInitialized && !this->mSmarts.empty());
+    }
+
     void ERaSmart::parseAutomations(const cJSON* const root) {
         cJSON* item = root->child;
         while (item != nullptr) {

src/ERa/ERaApi.hpp

@@ -752,6 +752,13 @@ class ERaApi
 
     bool isNeedSyncConfig() const {
         bool ret {false};
+#if defined(ERA_MODBUS) && defined(ERA_AUTOMATION)
+        bool need {false};
+        if (this->automation != nullptr) {
+            need = this->automation->isConfigUpdated(true);
+        }
+        ret |= Modbus::isNeedFinalize(need);
+#endif
 #if defined(ERA_ZIGBEE)
         ret |= Zigbee::isNeedFinalize();
 #endif

src/ERa/ERaAutomation.hpp

@@ -21,6 +21,7 @@ class ERaAutomation
         : mAuthToken(NULL)
         , mBaseTopic(NULL)
         , mCallback(NULL)
+        , mConfigUpdated(false)
     {
         memset(this->mHashID, 0, sizeof(this->mHashID));
     }
@@ -32,6 +33,18 @@ class ERaAutomation
     virtual void deleteAll() = 0;
     virtual void updateValue(ERaUInt_t configID, double value, bool trigger = false) = 0;
 
+    virtual bool isRunning() const {
+        return false;
+    }
+
+    bool isConfigUpdated(bool reset = false) const {
+        bool ret = this->mConfigUpdated;
+        if (reset) {
+            this->mConfigUpdated = false;
+        }
+        return ret;
+    }
+
     void setAuth(const char* auth) {
         this->mAuthToken = auth;
     }
@@ -49,6 +62,7 @@ class ERaAutomation
             return false;
         }
         if (strcmp(this->mHashID, hash)) {
+            this->mConfigUpdated = true;
             snprintf(this->mHashID, sizeof(this->mHashID), hash);
             return true;
         }
@@ -60,6 +74,7 @@ class ERaAutomation
     const char* mBaseTopic;
     MessageCallback_t mCallback;
 
+    mutable bool mConfigUpdated;
     char mHashID[37];
 };
 

src/ERa/ERaVersion.hpp

@@ -3,7 +3,7 @@
 
 #define ERA_MAJOR                   1
 #define ERA_MINOR                   5
-#define ERA_PATCH                   1
+#define ERA_PATCH                   2
 
 #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_5_1
+#define ERA_VERSION_1_5_2
 
 #if !defined(ERA_FIRMWARE_VERSION)
     #define ERA_FIRMWARE_VERSION    ERA_VERSION

src/Modbus/ERaModbus.hpp

@@ -328,6 +328,16 @@ class ERaModbus
         return (this->totalRead + this->totalWrite);
     }
 
+    bool isNeedFinalize(bool need = false) const {
+        if (!this->initialized) {
+            return false;
+        }
+        if (!need) {
+            return false;
+        }
+        return !ModbusTransp::isNewReport();
+    }
+
     void initModbusTask();
 
 #if defined(LINUX)