Merge pull request #445 from KipK/master

remove mqtt_retained declaration, conflict with virtualbool
OpenEVSE · Oct 16, 2022 · 3e157db · 3e157db
2 parents cd3d141 + 4cbb625
commit 3e157db
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/app_config.cpp b/src/app_config.cpp
@@ -51,7 +51,6 @@ String emoncms_fingerprint;
 String mqtt_server;
 uint32_t mqtt_port;
 String mqtt_topic;
-bool   mqtt_retained;
 String mqtt_user;
 String mqtt_pass;
 String mqtt_solar;

diff --git a/src/mqtt.cpp b/src/mqtt.cpp
@@ -330,9 +330,11 @@ mqtt_connect()
 
     mqtt_sub_topic = mqtt_topic + "/schedule/set";        
     mqttclient.subscribe(mqtt_sub_topic);
+    yield();
+
     mqtt_sub_topic = mqtt_topic + "/schedule/clear";        
     mqttclient.subscribe(mqtt_sub_topic);
-
+    yield();
     connecting = false;
   });