Merge pull request #38 from smoca-ag/master

khoih-prog · web-flow · commit 7653f809e096 · 2021-02-04T14:36:25.000-05:00
It should be possible to start the ConfigPortal without connecting to WiFI
diff --git a/src/ESPAsync_WiFiManager-Impl.h b/src/ESPAsync_WiFiManager-Impl.h
@@ -622,7 +622,7 @@ void ESPAsync_WiFiManager::scan()
 
 //////////////////////////////////////////
 
-void ESPAsync_WiFiManager::startConfigPortalModeless(char const *apName, char const *apPassword) 
+void ESPAsync_WiFiManager::startConfigPortalModeless(char const *apName, char const *apPassword, bool shouldConnectWiFi) 
 {
   _modeless     = true;
   _apName       = apName;
@@ -633,7 +633,7 @@ void ESPAsync_WiFiManager::startConfigPortalModeless(char const *apName, char co
   LOGDEBUG("SET AP STA");
 
   // try to connect
-  if (connectWifi("", "") == WL_CONNECTED)   
+  if (shouldConnectWiFi && connectWifi("", "") == WL_CONNECTED)   
   {
     LOGDEBUG1(F("IP Address:"), WiFi.localIP());
        
diff --git a/src/ESPAsync_WiFiManager.h b/src/ESPAsync_WiFiManager.h
@@ -319,7 +319,7 @@ class ESPAsync_WiFiManager
     // If you want to start the config portal
     bool          startConfigPortal();
     bool          startConfigPortal(char const *apName, char const *apPassword = NULL);
-    void startConfigPortalModeless(char const *apName, char const *apPassword);
+    void startConfigPortalModeless(char const *apName, char const *apPassword, bool shouldConnectWiFi = true);
 
 
     // get the AP name of the config portal, so it can be used in the callback
diff --git a/src_cpp/ESPAsync_WiFiManager.cpp b/src_cpp/ESPAsync_WiFiManager.cpp
@@ -622,7 +622,7 @@ void ESPAsync_WiFiManager::scan()
 
 //////////////////////////////////////////
 
-void ESPAsync_WiFiManager::startConfigPortalModeless(char const *apName, char const *apPassword) 
+void ESPAsync_WiFiManager::startConfigPortalModeless(char const *apName, char const *apPassword, bool shouldConnectWiFi) 
 {
   _modeless     = true;
   _apName       = apName;
@@ -633,7 +633,7 @@ void ESPAsync_WiFiManager::startConfigPortalModeless(char const *apName, char co
   LOGDEBUG("SET AP STA");
 
   // try to connect
-  if (connectWifi("", "") == WL_CONNECTED)   
+  if (shouldConnectWiFi && connectWifi("", "") == WL_CONNECTED)   
   {
     LOGDEBUG1(F("IP Address:"), WiFi.localIP());
        
diff --git a/src_cpp/ESPAsync_WiFiManager.h b/src_cpp/ESPAsync_WiFiManager.h
@@ -319,7 +319,7 @@ class ESPAsync_WiFiManager
     // If you want to start the config portal
     boolean       startConfigPortal();
     boolean       startConfigPortal(char const *apName, char const *apPassword = NULL);
-    void startConfigPortalModeless(char const *apName, char const *apPassword);
+    void startConfigPortalModeless(char const *apName, char const *apPassword, bool shouldConnectWiFi = true);
 
 
     // get the AP name of the config portal, so it can be used in the callback
diff --git a/src_h/ESPAsync_WiFiManager-Impl.h b/src_h/ESPAsync_WiFiManager-Impl.h
@@ -622,7 +622,7 @@ void ESPAsync_WiFiManager::scan()
 
 //////////////////////////////////////////
 
-void ESPAsync_WiFiManager::startConfigPortalModeless(char const *apName, char const *apPassword) 
+void ESPAsync_WiFiManager::startConfigPortalModeless(char const *apName, char const *apPassword, bool shouldConnectWiFi) 
 {
   _modeless     = true;
   _apName       = apName;
@@ -633,7 +633,7 @@ void ESPAsync_WiFiManager::startConfigPortalModeless(char const *apName, char co
   LOGDEBUG("SET AP STA");
 
   // try to connect
-  if (connectWifi("", "") == WL_CONNECTED)   
+  if (shouldConnectWiFi && connectWifi("", "") == WL_CONNECTED)   
   {
     LOGDEBUG1(F("IP Address:"), WiFi.localIP());
        
diff --git a/src_h/ESPAsync_WiFiManager.h b/src_h/ESPAsync_WiFiManager.h
@@ -319,7 +319,7 @@ class ESPAsync_WiFiManager
     // If you want to start the config portal
     bool          startConfigPortal();
     bool          startConfigPortal(char const *apName, char const *apPassword = NULL);
-    void startConfigPortalModeless(char const *apName, char const *apPassword);
+    void startConfigPortalModeless(char const *apName, char const *apPassword, bool shouldConnectWiFi = true);
 
 
     // get the AP name of the config portal, so it can be used in the callback

Original file line number	Diff line number	Diff line change
`@@ -622,7 +622,7 @@ void ESPAsync_WiFiManager::scan()`
`622`	`622`
`623`	`623`	`//////////////////////////////////////////`
`624`	`624`
`625`		`-void ESPAsync_WiFiManager::startConfigPortalModeless(char const apName, char const apPassword)`
	`625`	`+void ESPAsync_WiFiManager::startConfigPortalModeless(char const apName, char const apPassword, bool shouldConnectWiFi)`
`626`	`626`	`{`
`627`	`627`	`_modeless = true;`
`628`	`628`	`_apName = apName;`
`@@ -633,7 +633,7 @@ void ESPAsync_WiFiManager::startConfigPortalModeless(char const *apName, char co`
`633`	`633`	`LOGDEBUG("SET AP STA");`
`634`	`634`
`635`	`635`	`// try to connect`
`636`		`- if (connectWifi("", "") == WL_CONNECTED)`
	`636`	`+ if (shouldConnectWiFi && connectWifi("", "") == WL_CONNECTED)`
`637`	`637`	`{`
`638`	`638`	`LOGDEBUG1(F("IP Address:"), WiFi.localIP());`
`639`	`639`