esp32 esp web tools fix

Author: sblantipodi

src/BootstrapManager.cpp

@@ -20,21 +20,18 @@
 #include "BootstrapManager.h"
 
 
-void BootstrapManager::littleFsInit() {
+/********************************** BOOTSTRAP FUNCTIONS FOR SETUP() *****************************************/
+void BootstrapManager::bootstrapSetup(void (*manageDisconnections)(), void (*manageHardwareButton)(), void (*callback)(char*, byte*, unsigned int)) {
+
 #if defined(ESP8266)
   if (!LittleFS.begin()) {
 #elif defined(ESP32)
-    if (!LittleFS.begin(true)) {
+  if (!LittleFS.begin(true)) {
 #endif
     Serial.println("LittleFS mount failed");
     return;
   }
-}
-
-/********************************** BOOTSTRAP FUNCTIONS FOR SETUP() *****************************************/
-void BootstrapManager::bootstrapSetup(void (*manageDisconnections)(), void (*manageHardwareButton)(), void (*callback)(char*, byte*, unsigned int)) {
 
-  littleFsInit();
   if (isWifiConfigured() && !forceWebServer) {
     isConfigFileOk = true;
     // Initialize Wifi manager
@@ -54,29 +51,6 @@ void BootstrapManager::bootstrapSetup(void (*manageDisconnections)(), void (*man
 
 }
 
-/********************************** BOOTSTRAP FUNCTIONS FOR SETUP() *****************************************/
-void BootstrapManager::bootstrapSetup(void (*manageDisconnections)(), void (*manageHardwareButton)(), void (*callback)(char*, byte*, unsigned int), bool waitImprov, void (*listener)()) {
-
-  littleFsInit();
-  if (isWifiConfigured() && !forceWebServer) {
-    isConfigFileOk = true;
-    // Initialize Wifi manager
-    wifiManager.setupWiFi(manageDisconnections, manageHardwareButton);
-    // Initialize Queue Manager
-    if (mqttIP.length() > 0) {
-      QueueManager::setupMQTTQueue(callback);
-    } else {
-      Serial.println(F("Skip MQTT connection."));
-    }
-    // Initialize OTA manager
-    WifiManager::setupOTAUpload();
-  } else {
-    isConfigFileOk = false;
-    launchWebServerCustom(waitImprov, listener);
-  }
-
-}
-
 /********************************** BOOTSTRAP FUNCTIONS FOR LOOP() *****************************************/
 bool rcpResponseSent = false;
 void BootstrapManager::bootstrapLoop(void (*manageDisconnections)(), void (*manageQueueSubscription)(), void (*manageHardwareButton)()) {
@@ -470,6 +444,7 @@ bool BootstrapManager::isWifiConfigured() {
     StaticJsonDocument<BUFFER_SIZE> mydoc = readLittleFS("setup.json");
     if (mydoc.containsKey("qsid")) {
       Serial.println("Storage OK, restoring WiFi and MQTT config.");
+      deviceName = Helpers::getValue(mydoc["deviceName"]);
       microcontrollerIP = Helpers::getValue(mydoc["microcontrollerIP"]);
       qsid = Helpers::getValue(mydoc["qsid"]);
       qpass = Helpers::getValue(mydoc["qpass"]);
@@ -479,7 +454,6 @@ bool BootstrapManager::isWifiConfigured() {
       mqttuser = Helpers::getValue(mydoc["mqttuser"]);
       mqttpass = Helpers::getValue(mydoc["mqttpass"]);
       additionalParam = Helpers::getValue(mydoc["additionalParam"]);
-      deviceName = Helpers::getValue(mydoc["deviceName"]);
       return true;
     } else {
       Serial.println("No setup file");
@@ -493,13 +467,6 @@ bool BootstrapManager::isWifiConfigured() {
 void BootstrapManager::launchWebServerForOTAConfig() {
 
 #if (IMPROV_ENABLED > 0)
-  manageImprov();
-#endif
-  return WifiManager::launchWebServerForOTAConfig();
-
-}
-
-void BootstrapManager::manageImprov() {
   unsigned long timeNowStatus = 0;
   bool switchToWebServer = false;
   // If WiFi is not configured, handle improv packet for 15 seconds, then switch to settinigs managed by web server
@@ -511,16 +478,8 @@ void BootstrapManager::manageImprov() {
     }
     wifiManager.manageImprovWifi();
   }
-}
-
-void BootstrapManager::launchWebServerCustom(bool waitImprov, void (*listener)()) {
-
-#if (IMPROV_ENABLED > 0)
-  if (waitImprov) {
-    manageImprov();
-  }
 #endif
-  return WifiManager::launchWebServerCustom(listener);
+  return WifiManager::launchWebServerForOTAConfig();
 
 }
 

src/BootstrapManager.h

@@ -45,9 +45,7 @@ class BootstrapManager {
     // using JsonDocument = StaticJsonDocument<BUFFER_SIZE>;
     StaticJsonDocument<BUFFER_SIZE> parseQueueMsg(char* topic, byte* payload, unsigned int length); // print the message arriving from the queue
     StaticJsonDocument<BUFFER_SIZE> parseHttpMsg(String payload, unsigned int length); // print the message arriving from HTTP
-    void littleFsInit();
     void bootstrapSetup(void (*manageDisconnectionFunction)(), void (*manageHardwareButton)(), void (*callback)(char*, byte*, unsigned int)); // bootstrap setup()
-    void bootstrapSetup(void (*manageDisconnectionFunction)(), void (*manageHardwareButton)(), void (*callback)(char*, byte*, unsigned int), bool waitImprov, void (*listener)()); // bootstrap setup()
     void bootstrapLoop(void (*manageDisconnectionFunction)(), void (*manageQueueSubscription)(), void (*manageHardwareButton)()); // bootstrap loop()
     static void setMQTTWill(const char *topic, const char *payload, int qos, boolean retain, boolean cleanSession); // set the last will parameters for mqtt
     static void publish(const char *topic, const char *payload, boolean retained); // send a message on the queue
@@ -66,9 +64,8 @@ class BootstrapManager {
     [[maybe_unused]] String readValueFromFile(const String& filenameToUse, const String& paramName); // read a param from a json file
     static bool isWifiConfigured(); // check if wifi is correctly configured
     void launchWebServerForOTAConfig(); // if no ssid available, launch web server to get config params via browser
-    void launchWebServerCustom(bool waitImprov, void (*listener)()); // if no ssid available, launch web server to get config params via browser
     static int getWifiQuality(); // get the wifi quality
-    void manageImprov();
+
 };
 
 #endif

src/QueueManager.cpp

@@ -110,12 +110,25 @@ void QueueManager::mqttReconnect(void (*manageDisconnections)(), void (*manageQu
       Helpers::smartPrintln(F("MQTT attempts="));
       Helpers::smartPrintln(mqttReconnectAttemp);
       helper.smartDisplay();
+
+      if (mqttReconnectAttemp > 15) {
+        // if fastDisconnectionManagement we need to execute the callback immediately, 
+        // example: power off a watering system can't wait MAX_RECONNECT attemps
+        if (fastDisconnectionManagement) {
+          manageDisconnections();
+          Helpers::smartPrintln(F("Disconnecting WiFi."));
+          WiFi.reconnect();
+        }
+      }
+
       // after MAX_RECONNECT attemps all peripherals are shut down
-      if (mqttReconnectAttemp >= MAX_RECONNECT || fastDisconnectionManagement) {
+      if (mqttReconnectAttemp >= MAX_RECONNECT) {
         Helpers::smartPrintln(F("Max retry reached, powering off peripherals."));
         helper.smartDisplay();
         // Manage disconnections, powering off peripherals
         manageDisconnections();
+        Helpers::smartPrintln(F("Disconnecting WiFi."));
+        WiFi.reconnect();
       } else if (mqttReconnectAttemp > 10000) {
         mqttReconnectAttemp = 0;
       }

src/WifiManager.cpp

@@ -255,26 +255,11 @@ bool WifiManager::isWifiConfigured() {
 void WifiManager::launchWebServerForOTAConfig() {
 
   WiFi.disconnect();
-  Serial.println(F("Turning HotSpot On"));
+  Serial.println("Turning HotSpot On");
+
   setupAP();
   launchWeb();
-  while (WiFi.status() != WL_CONNECTED) {
-    delay(10);
-    server.handleClient();
-  }
-
-}
 
-void WifiManager::launchWebServerCustom(void (*listener)()) {
-
-  WiFi.disconnect();
-  Serial.println(F("Turning HotSpot On"));
-  WiFi.mode(WIFI_STA);
-  WiFi.disconnect();
-  delay(DELAY_200);
-  WiFi.softAP(WIFI_DEVICE_NAME, "");
-  listener();
-  server.begin();
   while (WiFi.status() != WL_CONNECTED) {
     delay(10);
     server.handleClient();

src/WifiManager.h

@@ -110,7 +110,6 @@ class WifiManager {
     static int getQuality();
     static bool isWifiConfigured(); // check if wifi is correctly configured
     static void launchWebServerForOTAConfig(); // if no ssid available, launch web server to get config params via browser
-    static void launchWebServerCustom(void (*listener)()); // if no ssid available, launch web server to get config params via browser
     void manageImprovWifi(); // if no ssid available, launch web server to get config params via browser
     void handleImprovPacket();
     void sendImprovInfoResponse();