Preserve WiFi mode #210

src/AutoConnect.cpp

@@ -79,18 +79,24 @@ bool AutoConnect::begin(const char* ssid, const char* passphrase, unsigned long
   // Overwrite for the current timeout value.
   _connectTimeout = timeout;
 
-  if (_apConfig.preserveAPMode && !_apConfig.autoRise) {
+  if (_apConfig.preserveWiFiMode && !_apConfig.autoRise) {
     // Captive portal will not be started on connection failure. Enable Station mode
     // without disabling any current soft AP.
-    cs = WiFi.enableSTA(true);
+    AC_DBG("WiFi mode %d maintained, STA ", WiFi.getMode());
-    AC_DBG(PSTR("Enable WIFI_STA: %s\n"), cs ? "Ok" : "Failed");
+    if (WiFi.enableSTA(true)) {
+      AC_DBG_DUMB("enabled");
+    }
+    else {
+      AC_DBG_DUMB("unavailable");
+    }
   }
   else {
     // Start WiFi connection with station mode.
     WiFi.softAPdisconnect(true);
-    cs = WiFi.mode(WIFI_STA);
+    if (!WiFi.mode(WIFI_STA)) {
+      AC_DBG("Unable start WIFI_STA");
+    }
     delay(100);
-    AC_DBG(PSTR("Switch to WIFI_STA: %s\n"), cs ? "Ok" : "Failed");
   }
 
   // Set host name

src/AutoConnect.h

@@ -105,7 +105,7 @@ class AutoConnectConfig {
     autoReconnect(false),
     immediateStart(false),
     retainPortal(false),
-    preserveAPMode(false),
+    preserveWiFiMode(false),
     portalTimeout(AUTOCONNECT_CAPTIVEPORTAL_TIMEOUT),
     menuItems(AC_MENUITEM_CONFIGNEW | AC_MENUITEM_OPENSSIDS | AC_MENUITEM_DISCONNECT | AC_MENUITEM_RESET | AC_MENUITEM_UPDATE | AC_MENUITEM_HOME),
     ticker(false),
@@ -142,7 +142,7 @@ class AutoConnectConfig {
     autoReconnect(false),
     immediateStart(false),
     retainPortal(false),
-    preserveAPMode(false),
+    preserveWiFiMode(false),
     portalTimeout(portalTimeout),
     menuItems(AC_MENUITEM_CONFIGNEW | AC_MENUITEM_OPENSSIDS | AC_MENUITEM_DISCONNECT | AC_MENUITEM_RESET | AC_MENUITEM_UPDATE | AC_MENUITEM_HOME),
     ticker(false),
@@ -179,7 +179,7 @@ class AutoConnectConfig {
     autoReconnect = o.autoReconnect;
     immediateStart = o.immediateStart;
     retainPortal = o.retainPortal;
-    preserveAPMode = o.preserveAPMode;
+    preserveWiFiMode = o.preserveWiFiMode;
     portalTimeout = o.portalTimeout;
     menuItems = o.menuItems;
     ticker = o.ticker;
@@ -216,7 +216,7 @@ class AutoConnectConfig {
   bool      autoReconnect;      /**< Automatic reconnect with past SSID */
   bool      immediateStart;     /**< Skips WiFi.begin(), start portal immediately */
   bool      retainPortal;       /**< Even if the captive portal times out, it maintains the portal state. */
-  bool      preserveAPMode;     /**< Keep existing AP WiFi mode if captive portal won't be started. */
+  bool      preserveWiFiMode;   /**< Keep existing WiFi mode if captive portal won't be started. */
   unsigned long portalTimeout;  /**< Timeout value for stay in the captive portal */
   uint16_t  menuItems;          /**< A compound value of the menu items to be attached */
   bool      ticker;             /**< Drives LED flicker according to WiFi connection status. */