Merge branch 'main' into Captive_Portal

Author: hmueller01

examples/ESP_WiFi/defines.h

@@ -22,6 +22,9 @@
 
 #define _ESP_WM_LITE_LOGLEVEL_        2
 
+// use builtin LED to show configuration mode
+#define USE_LED_BUILTIN               true
+
 #define USING_MRD                     true
 
 #if USING_MRD

examples/ESP_WiFi_MQTT/defines.h

@@ -22,6 +22,9 @@
 
 #define _ESP_WM_LITE_LOGLEVEL_        2
 
+// use builtin LED to show configuration mode
+#define USE_LED_BUILTIN               true
+
 #define USING_MRD                     true
 
 #if USING_MRD

src/ESP_WiFiManager_Lite.h

@@ -596,6 +596,10 @@ class ESP_WiFiManager_Lite
       connectWiFi(ssid, pass);
     }
 
+#if !defined(USE_LED_BUILTIN)
+  #define USE_LED_BUILTIN     true      // use builtin LED to show configuration mode
+#endif
+
 #if ESP8266
 
     // For ESP8266
@@ -631,9 +635,11 @@ class ESP_WiFiManager_Lite
     {
 #define TIMEOUT_CONNECT_WIFI      30000
 
-      //Turn OFF
+#if USE_LED_BUILTIN
+      // Turn OFF
       pinMode(LED_BUILTIN, OUTPUT);
       digitalWrite(LED_BUILTIN, LED_OFF);
+#endif
 
 #if USING_MRD
       //// New MRD ////
@@ -921,9 +927,10 @@ class ESP_WiFiManager_Lite
 
               if (connectMultiWiFi() == WL_CONNECTED)
               {
+#if USE_LED_BUILTIN
                 // turn the LED_BUILTIN OFF to tell us we exit configuration mode.
                 digitalWrite(LED_BUILTIN, LED_OFF);
-
+#endif
                 ESP_WML_LOGINFO(F("run: WiFi reconnected"));
               }
             }
@@ -933,9 +940,10 @@ class ESP_WiFiManager_Lite
 
             if (connectMultiWiFi() == WL_CONNECTED)
             {
+#if USE_LED_BUILTIN
               // turn the LED_BUILTIN OFF to tell us we exit configuration mode.
               digitalWrite(LED_BUILTIN, LED_OFF);
-
+#endif
               ESP_WML_LOGINFO(F("run: WiFi reconnected"));
             }
 
@@ -951,15 +959,17 @@ class ESP_WiFiManager_Lite
         // WiFi is connected and we are in configuration_mode
         configuration_mode = false;
         ESP_WML_LOGINFO(F("run: got WiFi back"));
+#if USE_LED_BUILTIN
         // turn the LED_BUILTIN OFF to tell us we exit configuration mode.
         digitalWrite(LED_BUILTIN, LED_OFF);
+  #endif
 
         if (dnsServer)
         {
           dnsServer->stop();
           delete dnsServer;
           dnsServer = nullptr;
-        }
+      }
 
         if (server)
         {
@@ -1172,7 +1182,6 @@ class ESP_WiFiManager_Lite
       setForcedCP(false);
 
       // Delay then reset the ESP8266 after save data
-      delay(1000);
       resetFunc();
     }
 
@@ -1186,7 +1195,6 @@ class ESP_WiFiManager_Lite
       setForcedCP(true);
 
       // Delay then reset the ESP8266 after save data
-      delay(1000);
       resetFunc();
     }
 
@@ -2547,11 +2555,7 @@ class ESP_WiFiManager_Lite
         drd->loop();
 #endif
 
-#if ESP8266
-        ESP.reset();
-#else
-        ESP.restart();
-#endif
+        resetFunc();
 
 #endif
       }
@@ -2931,8 +2935,7 @@ class ESP_WiFiManager_Lite
 
           // TO DO : what command to reset
           // Delay then reset the board after save data
-          delay(1000);
-          resetFunc();  //call reset
+          resetFunc();
         }
       }   // if (server)
     }
@@ -2952,8 +2955,10 @@ class ESP_WiFiManager_Lite
       WiFiNetworksFound = scanWifiNetworks(&indices);
 #endif
 
+#if USE_LED_BUILTIN
       // turn the LED_BUILTIN ON to tell us we are in configuration mode.
       digitalWrite(LED_BUILTIN, LED_ON);
+#endif
 
       if ( (portal_ssid == "") || portal_pass == "" )
       {