Refactored mqtt feature.

src/app_config.cpp

@@ -354,8 +354,8 @@ void config_changed(String name)
     timeManager.setTimeZone(time_zone);
   } else if(name == "flags") {
     divert.setMode((config_divert_enabled() && 1 == config_charge_mode()) ? DivertMode::Eco : DivertMode::Normal);
-    if(mqtt_connected() != config_mqtt_enabled()) {
-      mqtt_restart();
+    if(mqtt.isConnected() != config_mqtt_enabled()) {
+      mqtt.restartConnection();
     }
     if(emoncms_connected != config_emoncms_enabled()) {
       emoncms_updated = true;
@@ -364,7 +364,7 @@ void config_changed(String name)
     OcppTask::notifyConfigChanged();
     evse.setSleepForDisable(!config_pause_uses_disabled());
   } else if(name.startsWith("mqtt_")) {
-    mqtt_restart();
+    mqtt.restartConnection();
   } else if(name.startsWith("ocpp_")) {
     OcppTask::notifyConfigChanged();
   } else if(name.startsWith("emoncms_")) {

src/app_config_mode.h

@@ -4,7 +4,6 @@
 #include <ConfigOpt.h>
 #include <ConfigOptDefinition.h>
 
-#include "mqtt.h"
 #include "app_config.h"
 
 class ConfigOptVirtualChargeMode : public ConfigOpt

src/app_config_mqtt.h

@@ -4,7 +4,6 @@
 #include <ConfigOpt.h>
 #include <ConfigOptDefinition.h>
 
-#include "mqtt.h"
 #include "app_config.h"
 
 class ConfigOptVirtualMqttProtocol : public ConfigOpt

src/current_shaper.h

@@ -17,7 +17,6 @@
 #include "emonesp.h"
 #include <MicroTasks.h>
 #include "evse_man.h"
-#include "mqtt.h"
 #include "app_config.h"
 #include "http_update.h"
 #include "input.h"

src/main.cpp

@@ -182,6 +182,8 @@ void setup()
 
   input_setup();
 
+  mqtt.begin();
+
   ocpp.begin(evse, lcd, eventLog, rfid);
   DBUGF("After ocpp.begin: %d", ESPAL.getFreeHeap());
 
@@ -237,8 +239,6 @@ loop() {
       teslaClient.loop();
     }
 
-    mqtt_loop();
-
     // -------------------------------------------------------------------
     // Do these things once every 30 seconds
     // -------------------------------------------------------------------
@@ -300,7 +300,7 @@ void event_send(JsonDocument &event)
   #endif
   web_server_event(event);
   yield();
-  mqtt_publish(event);
+  mqtt.publishData(event);
   yield();
 }