esp32 esp web tools fix

Author: sblantipodi

src/BootstrapManager.h

@@ -50,9 +50,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
@@ -71,9 +69,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

@@ -100,12 +100,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.h

@@ -120,7 +120,6 @@ class WifiManager {
 
     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();