reinitialize mqqt subscription after reconnect

helgeerbe · Mar 22, 2023 · 55dc4db · 55dc4db
1 parent 5d5124d
commit 55dc4db
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/src/WebApi_mqtt.cpp b/src/WebApi_mqtt.cpp
@@ -10,6 +10,8 @@
 #include "WebApi.h"
 #include "WebApi_errors.h"
 #include "helper.h"
+#include "PowerLimiter.h"
+#include "PowerMeter.h"
 #include <AsyncJson.h>
 
 void WebApiMqttClass::init(AsyncWebServer* server)
@@ -318,6 +320,8 @@ void WebApiMqttClass::onMqttAdminPost(AsyncWebServerRequest* request)
     MqttSettings.performReconnect();
     MqttHandleHass.forceUpdate();
     MqttHandleVedirectHass.forceUpdate();
+    PowerMeter.init();
+    PowerLimiter.init();
 }
 
 String WebApiMqttClass::getRootCaCertInfo(const char* cert)

diff --git a/src/WebApi_powerlimiter.cpp b/src/WebApi_powerlimiter.cpp
@@ -8,7 +8,9 @@
 #include "AsyncJson.h"
 #include "Configuration.h"
 #include "MqttHandleHass.h"
+#include "MqttHandleVedirectHass.h"
 #include "MqttSettings.h"
+#include "PowerMeter.h"
 #include "PowerLimiter.h"
 #include "WebApi.h"
 #include "helper.h"
@@ -141,6 +143,9 @@ void WebApiPowerLimiterClass::onAdminPost(AsyncWebServerRequest* request)
     response->setLength();
     request->send(response);
 
-    MqttSettings.performReconnect();  // TODO(helge) is this really needed
+    MqttSettings.performReconnect();  
     PowerLimiter.init();
+    PowerMeter.init();
+    MqttHandleHass.forceUpdate();
+    MqttHandleVedirectHass.forceUpdate();
 }
diff --git a/src/WebApi_powermeter.cpp b/src/WebApi_powermeter.cpp
@@ -7,8 +7,10 @@
 #include "ArduinoJson.h"
 #include "AsyncJson.h"
 #include "Configuration.h"
+#include "MqttHandleVedirectHass.h"
 #include "MqttHandleHass.h"
 #include "MqttSettings.h"
+#include "PowerLimiter.h"
 #include "PowerMeter.h"
 #include "WebApi.h"
 #include "helper.h"
@@ -115,9 +117,11 @@ void WebApiPowerMeterClass::onAdminPost(AsyncWebServerRequest* request)
 
     response->setLength();
     request->send(response);
-
+
+
+    MqttSettings.performReconnect();  
     PowerMeter.init();
-    MqttSettings.performReconnect();
+    PowerLimiter.init();
     MqttHandleHass.forceUpdate();
-
+    MqttHandleVedirectHass.forceUpdate();
 }