Added preserveAPMode setting

pull/217/head
TKTF50 5 years ago
parent d39545ce13
commit d7dd2153e7
  1. 11
      src/AutoConnect.cpp
  2. 4
      src/AutoConnect.h

@ -79,10 +79,19 @@ bool AutoConnect::begin(const char* ssid, const char* passphrase, unsigned long
// Overwrite for the current timeout value. // Overwrite for the current timeout value.
_connectTimeout = timeout; _connectTimeout = timeout;
if (_apConfig.preserveAPMode && !_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(PSTR("Enable WIFI_STA: %s\n"), cs ? "Ok" : "Failed");
}
else {
// Start WiFi connection with station mode. // Start WiFi connection with station mode.
WiFi.softAPdisconnect(true); WiFi.softAPdisconnect(true);
WiFi.mode(WIFI_STA); cs = WiFi.mode(WIFI_STA);
delay(100); delay(100);
AC_DBG(PSTR("Switch to WIFI_STA: %s\n"), cs ? "Ok" : "Failed");
}
// Set host name // Set host name
if (_apConfig.hostName.length()) if (_apConfig.hostName.length())

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

Loading…
Cancel
Save