Check that all RF modules as in idle mode before sending mqtt packages

tbnobody · Apr 15, 2023 · de2b7ab · de2b7ab
1 parent b7fb294
commit de2b7ab
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/lib/Hoymiles/src/Hoymiles.cpp b/lib/Hoymiles/src/Hoymiles.cpp
@@ -205,6 +205,11 @@ HoymilesRadio_CMT* HoymilesClass::getRadioCmt()
     return _radioCmt.get();
 }
 
+bool HoymilesClass::isAllRadioIdle()
+{
+    return _radioNrf.get()->isIdle() && _radioCmt.get()->isIdle();
+}
+
 uint32_t HoymilesClass::PollInterval()
 {
     return _pollInterval;

diff --git a/lib/Hoymiles/src/Hoymiles.h b/lib/Hoymiles/src/Hoymiles.h
@@ -36,6 +36,8 @@ class HoymilesClass {
     uint32_t PollInterval();
     void setPollInterval(uint32_t interval);
 
+    bool isAllRadioIdle();
+
 private:
     std::vector<std::shared_ptr<InverterAbstract>> _inverters;
     std::unique_ptr<HoymilesRadio_NRF> _radioNrf;

diff --git a/src/MqttHandleDtu.cpp b/src/MqttHandleDtu.cpp
@@ -16,7 +16,7 @@ void MqttHandleDtuClass::init()
 
 void MqttHandleDtuClass::loop()
 {
-    if (!MqttSettings.getConnected() || !Hoymiles.getRadioNrf()->isIdle()) {
+    if (!MqttSettings.getConnected() || !Hoymiles.isAllRadioIdle()) {
         return;
     }
 

diff --git a/src/MqttHandleHass.cpp b/src/MqttHandleHass.cpp
@@ -41,7 +41,7 @@ void MqttHandleHassClass::publishConfig()
         return;
     }
 
-    if (!MqttSettings.getConnected() && Hoymiles.getRadioNrf()->isIdle()) {
+    if (!MqttSettings.getConnected() && Hoymiles.isAllRadioIdle()) {
         return;
     }
 

diff --git a/src/MqttHandleInverter.cpp b/src/MqttHandleInverter.cpp
@@ -36,7 +36,7 @@ void MqttHandleInverterClass::init()
 
 void MqttHandleInverterClass::loop()
 {
-    if (!MqttSettings.getConnected() || !Hoymiles.getRadioNrf()->isIdle()) {
+    if (!MqttSettings.getConnected() || !Hoymiles.isAllRadioIdle()) {
         return;
     }