with IP "); + page += WiFi.localIP().toString(); + page += F(""); + } else { + page += "
";
+ page += "Not Connected to ";
+ page += WiFi.SSID();
+ }
+ } else {
+ page += "
void WiFiManager::DEBUG_WM(Generic text) {
if (_debug) {
- Serial.print("*WM: ");
- Serial.println(text);
+ _debugPort.print("*WM: ");
+ _debugPort.print(text);
+ _debugPort.print("\n");
}
}
+template
+void WiFiManager::DEBUG_WM(Generic text,Genericb textb) {
+ if (_debug) {
+ _debugPort.print("*WM: ");
+ _debugPort.print(text);
+ _debugPort.print(" ");
+ _debugPort.print(textb);
+ _debugPort.print("\n");
+ }
+}
+
+/*
+ String WiFiManager::getSSID() {
+ if (_ssid == "") {
+ DEBUG_WM(F("Reading SSID"));
+ _ssid = WiFi.SSID();
+ DEBUG_WM(F("SSID: "));
+ DEBUG_WM(_ssid);
+ }
+ return _ssid;
+ }
+
+ String WiFiManager::getPassword() {
+ if (_pass == "") {
+ DEBUG_WM(F("Reading Password"));
+ _pass = WiFi.psk();
+ DEBUG_WM("Password: " + _pass);
+ //DEBUG_WM(_pass);
+ }
+ return _pass;
+ }
+*/
+
+void WiFiManager::debugSoftAPConfig(){
+ softap_config config;
+ wifi_softap_get_config(&config);
+
+ DEBUG_WM(F("SoftAP Configuration"));
+ DEBUG_WM(F("--------------------"));
+ DEBUG_WM(F("ssid: "),(char *) config.ssid);
+ DEBUG_WM(F("password: "),(char *) config.password);
+ DEBUG_WM(F("ssid_len: "),config.ssid_len);
+ DEBUG_WM(F("channel: "),config.channel);
+ DEBUG_WM(F("authmode: "),config.authmode);
+ DEBUG_WM(F("ssid_hidden: "),config.ssid_hidden);
+ DEBUG_WM(F("max_connection: "),config.max_connection);
+ DEBUG_WM(F("beacon_interval: "),(String)config.beacon_interval + "(ms)");
+ DEBUG_WM(F("--------------------"));
+}
+
+
int WiFiManager::getRSSIasQuality(int RSSI) {
int quality = 0;
@@ -804,3 +1306,117 @@ String WiFiManager::toStringIp(IPAddress ip) {
res += String(((ip >> 8 * 3)) & 0xFF);
return res;
}
+
+boolean WiFiManager::validApPassword(){
+ // check that ap password is valid, return false
+ if (_apPassword == NULL) _apPassword = "";
+ if (_apPassword != "") {
+ if (_apPassword.length() < 8 || _apPassword.length() > 63) {
+ DEBUG_WM(F("AccessPoint set password is INVALID"));
+ _apPassword = "";
+ return false; // @todo FATAL or fallback to empty ?
+ }
+ DEBUG_WM(F("AccessPoint set password is VALID"));
+ DEBUG_WM(_apPassword);
+ }
+ return true;
+}
+
+String WiFiManager::getWLStatusString(uint8_t status){
+ const char * const WIFI_STA_STATUS[]
+ {
+ "WL_IDLE_STATUS",
+ "WL_NO_SSID_AVAIL",
+ "WL_SCAN_COMPLETED",
+ "WL_CONNECTED",
+ "WL_CONNECT_FAILED",
+ "WL_CONNECTION_LOST",
+ "WL_DISCONNECTED"
+ };
+
+ if(status >=0 && status <=6) return WIFI_STA_STATUS[status];
+ return "UNKNOWN";
+}
+
+String WiFiManager::encryptionTypeStr(uint8_t authmode) {
+ switch(authmode) {
+ case ENC_TYPE_NONE:
+ return "None";
+ case ENC_TYPE_WEP:
+ return "WEP";
+ case ENC_TYPE_TKIP:
+ return "WPA_PSK";
+ case ENC_TYPE_CCMP:
+ return "WPA2_PSK";
+ case ENC_TYPE_AUTO:
+ return "WPA_WPA2_PSK";
+ default:
+ return "Unknown";
+ }
+}
+
+// set mode ignores WiFi.persistent
+bool WiFiManager::WiFi_Mode(WiFiMode_t m,bool persistent) {
+ if((wifi_get_opmode() == (uint8) m ) && !persistent) {
+ return true;
+ }
+ bool ret;
+ ETS_UART_INTR_DISABLE();
+ if(persistent) ret = wifi_set_opmode(m);
+ else ret = wifi_set_opmode_current(m);
+ ETS_UART_INTR_ENABLE();
+
+ return ret;
+}
+bool WiFiManager::WiFi_Mode(WiFiMode_t m) {
+ return WiFi_Mode(m,false);
+}
+
+// sta disconnect without persistent
+bool WiFiManager::WiFi_Disconnect() {
+ if((WiFi.getMode() & WIFI_STA) != 0) {
+ bool ret;
+ DEBUG_WM(F("wifi station disconnect"));
+ ETS_UART_INTR_DISABLE();
+ ret = wifi_station_disconnect();
+ ETS_UART_INTR_ENABLE();
+ return ret;
+ }
+}
+
+// toggle STA without persistent
+bool WiFiManager::WiFi_enableSTA(bool enable,bool persistent) {
+
+ WiFiMode_t currentMode = WiFi.getMode();
+ bool isEnabled = ((currentMode & WIFI_STA) != 0);
+
+ if((isEnabled != enable) || persistent) {
+ if(enable) {
+ if(persistent) DEBUG_WM(F("enableSTA PERSISTENT ON"));
+ return WiFi_Mode((WiFiMode_t)(currentMode | WIFI_STA),persistent);
+ } else {
+ return WiFi_Mode((WiFiMode_t)(currentMode & (~WIFI_STA)),persistent);
+ }
+ } else {
+ return true;
+ }
+}
+bool WiFiManager::WiFi_enableSTA(bool enable) {
+ return WiFi_enableSTA(enable,false);
+}
+
+// erase config BUG polyfill
+// https://github.com/esp8266/Arduino/pull/3635
+bool WiFiManager::ESP_eraseConfig(void) {
+ // return ESP.eraseConfig();
+
+ const size_t cfgSize = 0x4000;
+ size_t cfgAddr = ESP.getFlashChipSize() - cfgSize;
+
+ for (size_t offset = 0; offset < cfgSize; offset += SPI_FLASH_SEC_SIZE) {
+ if (!ESP.flashEraseSector((cfgAddr + offset) / SPI_FLASH_SEC_SIZE)) {
+ return false;
+ }
+ }
+ return true;
+}
\ No newline at end of file
diff --git a/WiFiManager.h b/WiFiManager.h
index 00e8bd3..826be09 100644
--- a/WiFiManager.h
+++ b/WiFiManager.h
@@ -5,7 +5,7 @@
inspired by:
http://www.esp8266.com/viewtopic.php?f=29&t=2520
https://github.com/chriscook8/esp-arduino-apboot
- https://github.com/esp8266/Arduino/tree/esp8266/hardware/esp8266com/esp8266/libraries/DNSServer/examples/CaptivePortalAdvanced
+ https://github.com/esp8266/Arduino/tree/master/libraries/DNSServer/examples/CaptivePortalAdvanced
Built by AlexT https://github.com/tzapu
Licensed under MIT license
**************************************************************/
@@ -22,21 +22,43 @@ extern "C" {
#include "user_interface.h"
}
-const char HTTP_HEAD[] PROGMEM = "{v} ";
-const char HTTP_STYLE[] PROGMEM = "";
+const char HTTP_HEAD[] PROGMEM = "{v} ";
+// const char HTTP_STYLE[] PROGMEM = "";
+const char HTTP_STYLE[] PROGMEM = "";
+
const char HTTP_SCRIPT[] PROGMEM = "";
-const char HTTP_HEAD_END[] PROGMEM = "
";
+ page += "No AP set";
+ }
+ page += "
";
+}
+
+/**
+ * HTTPD CALLBACK reset page
+ */
+void WiFiManager::handleReset() {
+ DEBUG_WM(F("<- HTTP Reset"));
+
+ String page = FPSTR(HTTP_HEAD);
+ page.replace("{v}", "Reset");
page += FPSTR(HTTP_SCRIPT);
page += FPSTR(HTTP_STYLE);
page += _customHeadElement;
page += FPSTR(HTTP_HEAD_END);
page += F("Module will reset in a few seconds.");
page += FPSTR(HTTP_END);
+
+ server->sendHeader("Content-Length", String(page.length()));
server->send(200, "text/html", page);
- DEBUG_WM(F("Sent reset page"));
- delay(5000);
+ DEBUG_WM(F("RESETTING ESP"));
+ delay(1000);
ESP.reset();
- delay(2000);
}
+/**
+ * HTTPD CALLBACK erase page
+ */
+void WiFiManager::handleErase() {
+ DEBUG_WM(F("<- HTTP Erase"));
+ String page = FPSTR(HTTP_HEAD);
+ page.replace("{v}", "Erase");
+ page += FPSTR(HTTP_SCRIPT);
+ page += FPSTR(HTTP_STYLE);
+ page += _customHeadElement;
+ page += FPSTR(HTTP_HEAD_END);
-//removed as mentioned here https://github.com/tzapu/WiFiManager/issues/114
-/*void WiFiManager::handle204() {
- DEBUG_WM(F("204 No Response"));
- server->sendHeader("Cache-Control", "no-cache, no-store, must-revalidate");
- server->sendHeader("Pragma", "no-cache");
- server->sendHeader("Expires", "-1");
- server->send ( 204, "text/plain", "");
-}*/
+ bool ret = ESP_eraseConfig();
+ if(!ret) DEBUG_WM(F("ERASE FAILED"));
+
+ // bool ret = reset = true;
+
+ if(ret) page += F("Module will reset in a few seconds.");
+ else {
+ page += F("An Error Occured");
+ DEBUG_WM(F("WiFi.eraseConfig reported an error"));
+ }
+
+ page += FPSTR(HTTP_END);
+ server->sendHeader("Content-Length", String(page.length()));
+ server->send(200, "text/html", page);
+ delay(2000);
+
+ if(ret){
+ DEBUG_WM(F("RESETTING ESP"));
+ ESP.reset();
+ }
+}
void WiFiManager::handleNotFound() {
if (captivePortal()) { // If captive portal redirect instead of displaying the error page.
@@ -725,14 +1146,22 @@ void WiFiManager::handleNotFound() {
server->sendHeader("Cache-Control", "no-cache, no-store, must-revalidate");
server->sendHeader("Pragma", "no-cache");
server->sendHeader("Expires", "-1");
+ server->sendHeader("Content-Length", String(message.length()));
server->send ( 404, "text/plain", message );
}
-
-/** Redirect to captive portal if we got a request for another domain. Return true in that case so the page handler do not try to handle the request again. */
+/**
+ * HTTPD redirector
+ * Redirect to captive portal if we got a request for another domain.
+ * Return true in that case so the page handler do not try to handle the request again.
+ */
boolean WiFiManager::captivePortal() {
- if (!isIp(server->hostHeader()) ) {
- DEBUG_WM(F("Request redirected to captive portal"));
+ DEBUG_WM("-> " + server->hostHeader());
+
+ if(!_enableCaptivePortal) return false; // skip redirections
+
+ if (!isIp(server->hostHeader())) {
+ DEBUG_WM(F("<- Request redirected to captive portal"));
server->sendHeader("Location", String("http://") + toStringIp(server->client().localIP()), true);
server->send ( 302, "text/plain", ""); // Empty content inhibits Content-length header so we have to close the socket ourselves.
server->client().stop(); // Stop is needed because we sent no content length
@@ -741,6 +1170,8 @@ boolean WiFiManager::captivePortal() {
return false;
}
+// MORE SETTERS
+
//start up config portal callback
void WiFiManager::setAPCallback( void (*func)(WiFiManager* myWiFiManager) ) {
_apcallback = func;
@@ -761,16 +1192,87 @@ void WiFiManager::setRemoveDuplicateAPs(boolean removeDuplicates) {
_removeDuplicateAPs = removeDuplicates;
}
+//if this is true, remove duplicated Access Points - defaut true
+void WiFiManager::setConfigPortalBlocking(boolean shoudlBlock) {
+ _configPortalIsBlocking = shoudlBlock;
+}
+//setter for ESP wifi.persistent so we can remember it and restore user preference, as WIFi._persistent is protected
+void WiFiManager::setRestorePersistent(boolean persistent) {
+ _userpersistent = persistent;
+ if(!persistent) DEBUG_WM(F("persistent is off"));
+}
+
+void WiFiManager::setShowStaticFields(boolean alwaysShow){
+ _sta_show_static_fields = alwaysShow;
+}
+
+void WiFiManager::setCaptivePortalEnable(boolean enabled){
+ _enableCaptivePortal = enabled;
+}
+
+// HELPERS
template ";
-const char HTTP_PORTAL_OPTIONS[] PROGMEM = "
"; -const char HTTP_ITEM[] PROGMEM = "
"; -const char HTTP_SAVED[] PROGMEM = " dnsServer;
@@ -130,14 +164,23 @@ class WiFiManager
void setupConfigPortal();
void startWPS();
+ bool startAP();
- const char* _apName = "no-net";
- const char* _apPassword = NULL;
+ // typedef enum WiFiMode
+ // {
+ // WIFI_OFF = 0, WIFI_STA = 1, WIFI_AP = 2, WIFI_AP_STA = 3
+ // } WiFiMode_t;
+
+ String _apName = "no-net";
+ String _apPassword = "";
String _ssid = "";
String _pass = "";
unsigned long _configPortalTimeout = 0;
unsigned long _connectTimeout = 0;
unsigned long _configPortalStart = 0;
+ boolean _userpersistent = true;
+ WiFiMode_t _usermode = WIFI_OFF;
+ boolean _enableCaptivePortal = true;
IPAddress _ap_static_ip;
IPAddress _ap_static_gw;
@@ -147,11 +190,13 @@ class WiFiManager
IPAddress _sta_static_sn;
boolean _sta_show_static_fields = false;
+ // option parameters
int _paramsCount = 0;
int _minimumQuality = -1;
boolean _removeDuplicateAPs = true;
boolean _shouldBreakAfterConfig = false;
boolean _tryWPS = false;
+ boolean _configPortalIsBlocking = true;
const char* _customHeadElement = "";
@@ -161,6 +206,8 @@ class WiFiManager
int status = WL_IDLE_STATUS;
int connectWifi(String ssid, String pass);
uint8_t waitForConnectResult();
+ uint8_t waitForConnectResult(uint16_t timeout);
+ String getWLStatusString(uint8_t status);
void handleRoot();
void handleWifi(boolean scan);
@@ -168,9 +215,24 @@ class WiFiManager
void handleInfo();
void handleReset();
void handleNotFound();
- void handle204();
+ void handleExit();
+ void handleErase();
+
boolean captivePortal();
boolean configPortalHasTimeout();
+ boolean stopConfigPortal();
+ uint8_t handleConfigPortal();
+ bool WiFi_Mode(WiFiMode_t m);
+ bool WiFi_Mode(WiFiMode_t m,bool persistent);
+ bool WiFi_Disconnect();
+ bool WiFi_enableSTA(bool enable);
+ bool WiFi_enableSTA(bool enable,bool persistent);
+ bool ESP_eraseConfig();
+ void debugSoftAPConfig();
+
+ String getParamOut();
+ String getScanItemOut();
+ String getStaticOut();
// DNS server
const byte DNS_PORT = 53;
@@ -179,17 +241,31 @@ class WiFiManager
int getRSSIasQuality(int RSSI);
boolean isIp(String str);
String toStringIp(IPAddress ip);
+ boolean validApPassword();
+ String encryptionTypeStr(uint8_t authmode);
+ void reportStatus(String &page);
boolean connect;
- boolean _debug = true;
+ boolean abort;
+ boolean reset = false;
+ boolean configPortalActive = false;
+ boolean webPortalActive = false;
+ boolean _debug = true;
+ boolean portalTimeoutResult = false;
+ boolean portalAbortResult = false;
+ boolean storeSTAmode = true; // option store persistent STA mode in connectwifi
+ int timer = 0;
void (*_apcallback)(WiFiManager*) = NULL;
void (*_savecallback)(void) = NULL;
+ Stream& _debugPort; // debug output stream ref
WiFiManagerParameter* _params[WIFI_MANAGER_MAX_PARAMS];
template
void DEBUG_WM(Generic text);
+ template
+ void DEBUG_WM(Generic text,Genericb textb);
template
auto optionalIPFromString(T *obj, const char *s) -> decltype( obj->fromString(s) ) {
diff --git a/examples/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino b/examples/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino
index 1d58e5c..1891808 100644
--- a/examples/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino
+++ b/examples/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino
@@ -102,7 +102,7 @@ void setup() {
//sets timeout until configuration portal gets turned off
//useful to make it all retry or go to sleep
//in seconds
- //wifiManager.setTimeout(120);
+ //wifiManager.setConfigPortalTimeout(120);
//fetches ssid and pass and tries to connect
//if it does not connect it starts an access point with the specified name
diff --git a/examples/AutoConnectWithFSParametersAndCustomIP/AutoConnectWithFSParametersAndCustomIP.ino b/examples/AutoConnectWithFSParametersAndCustomIP/AutoConnectWithFSParametersAndCustomIP.ino
index 3f391ae..135b99f 100644
--- a/examples/AutoConnectWithFSParametersAndCustomIP/AutoConnectWithFSParametersAndCustomIP.ino
+++ b/examples/AutoConnectWithFSParametersAndCustomIP/AutoConnectWithFSParametersAndCustomIP.ino
@@ -129,7 +129,7 @@ void setup() {
//sets timeout until configuration portal gets turned off
//useful to make it all retry or go to sleep
//in seconds
- //wifiManager.setTimeout(120);
+ //wifiManager.setConfigPortalTimeout(120);
//fetches ssid and pass and tries to connect
//if it does not connect it starts an access point with the specified name
diff --git a/examples/AutoConnectWithTimeout/AutoConnectWithTimeout.ino b/examples/AutoConnectWithTimeout/AutoConnectWithTimeout.ino
index c90cf10..da77cbe 100644
--- a/examples/AutoConnectWithTimeout/AutoConnectWithTimeout.ino
+++ b/examples/AutoConnectWithTimeout/AutoConnectWithTimeout.ino
@@ -20,7 +20,7 @@ void setup() {
//sets timeout until configuration portal gets turned off
//useful to make it all retry or go to sleep
//in seconds
- wifiManager.setTimeout(180);
+ wifiManager.setConfigPortalTimeout(180);
//fetches ssid and pass and tries to connect
//if it does not connect it starts an access point with the specified name
diff --git a/examples/AutoConnectWithTimeout/platformio.ini b/examples/AutoConnectWithTimeout/platformio.ini
new file mode 100644
index 0000000..7e80288
--- /dev/null
+++ b/examples/AutoConnectWithTimeout/platformio.ini
@@ -0,0 +1,18 @@
+; PlatformIO Project Configuration File
+;
+; Build options: build flags, source filter
+; Upload options: custom upload port, speed and extra flags
+; Library options: dependencies, extra library storages
+; Advanced options: extra scripting
+;
+; Please visit documentation for the other options and examples
+; http://docs.platformio.org/page/projectconf.html
+
+[env:nodemcuv2]
+platform=espressif8266
+board=nodemcuv2
+framework=arduino
+
+[platformio]
+src_dir=AutoConnectWithTimeout
+lib_dir=/Users/shawn/projects/microcontrollers/dev/libraries
diff --git a/examples/OnDemandConfigPortal/OnDemandConfigPortal.ino b/examples/OnDemandConfigPortal/OnDemandConfigPortal.ino
index edf4f46..1292c35 100644
--- a/examples/OnDemandConfigPortal/OnDemandConfigPortal.ino
+++ b/examples/OnDemandConfigPortal/OnDemandConfigPortal.ino
@@ -5,7 +5,7 @@
#include
#include //https://github.com/tzapu/WiFiManager
-// select wich pin will trigger the configuraton portal when set to LOW
+// select which pin will trigger the configuration portal when set to LOW
// ESP-01 users please note: the only pins available (0 and 2), are shared
// with the bootloader, so always set them HIGH at power-up
#define TRIGGER_PIN 0
@@ -33,7 +33,7 @@ void loop() {
//sets timeout until configuration portal gets turned off
//useful to make it all retry or go to sleep
//in seconds
- //wifiManager.setTimeout(120);
+ //wifiManager.setConfigPortalTimeout(120);
//it starts an access point with the specified name
//here "AutoConnectAP"
@@ -42,6 +42,9 @@ void loop() {
//WITHOUT THIS THE AP DOES NOT SEEM TO WORK PROPERLY WITH SDK 1.5 , update to at least 1.5.1
//WiFi.mode(WIFI_STA);
+ // disable captive portal redirection
+ // wifiManager.setCaptivePortalEnable(false);
+
if (!wifiManager.startConfigPortal("OnDemandAP")) {
Serial.println("failed to connect and hit timeout");
delay(3000);
diff --git a/examples/OnDemandWebPortal/OnDemandWebPortal.ino b/examples/OnDemandWebPortal/OnDemandWebPortal.ino
new file mode 100644
index 0000000..50f5657
--- /dev/null
+++ b/examples/OnDemandWebPortal/OnDemandWebPortal.ino
@@ -0,0 +1,57 @@
+/**
+ * OnDemandWebPortal.ino
+ * example of running the webportal manually, independantly from the captiveportal
+ * trigger pin will start a webportal for 120 seconds then turn it off.
+ *
+ */
+
+#include //https://github.com/esp8266/Arduino
+
+//needed for library
+#include
+#include
+#include //https://github.com/tzapu/WiFiManager
+
+// select which pin will trigger the configuration portal when set to LOW
+// ESP-01 users please note: the only pins available (0 and 2), are shared
+// with the bootloader, so always set them HIGH at power-up
+#define TRIGGER_PIN 0
+
+// set your ap credentials
+const char *ssid = "********";
+const char *password = "********";
+
+int timeout = 120; // seconds
+
+WiFiManager wifiManager;
+
+bool webportalrunning = false;
+int start = millis();
+
+void setup() {
+ // put your setup code here, to run once:
+ Serial.begin(115200);
+ Serial.println("\n Starting");
+ pinMode(TRIGGER_PIN, INPUT_PULLUP);
+}
+
+
+void loop() {
+
+ if(webportalrunning){
+ wifiManager.process();
+ if(millis()-start > timeout*1000){
+ Serial.println("webportaltimeout");
+ webportalrunning = false;
+ wifiManager.stopWebPortal(); // auto off
+ }
+ }
+
+ // is configuration portal requested?
+ if ( digitalRead(TRIGGER_PIN) == LOW && !webportalrunning) {
+ wifiManager.startWebPortal();
+ webportalrunning = true;
+ start = millis();
+ }
+ // put your main code here, to run repeatedly:
+}
diff --git a/extras/WiFiManager.template.html b/extras/WiFiManager.template.html
index e15593b..09ae94b 100644
--- a/extras/WiFiManager.template.html
+++ b/extras/WiFiManager.template.html
@@ -6,15 +6,132 @@
{v}
-
+
+
+
+
+
+
+
+
+
+
+
+
"; -const char HTTP_ITEM[] PROGMEM = "
{v} {r}%
";
-const char HTTP_FORM_START[] PROGMEM = "";
-const char HTTP_SCAN_LINK[] PROGMEM = ""; -const char HTTP_SAVED[] PROGMEM = "
Credentials Saved
Trying to connect ESP to network.
If it fails reconnect to AP to try again
";
+const char HTTP_HEAD_END[] PROGMEM = "Trying to connect ESP to network.
If it fails reconnect to AP to try again
";
+const char HTTP_PORTAL_OPTIONS[] PROGMEM = "
"; +const char HTTP_ITEM[] PROGMEM = ""; +// const char HTTP_ITEM[] PROGMEM = "
";
+const char HTTP_FORM_START[] PROGMEM = "";
+const char HTTP_FORM_LABEL[] PROGMEM = "";
+const char HTTP_FORM_PARAM_START[] PROGMEM = "
"; +const char HTTP_FORM_PARAM[] PROGMEM = "
"; +const char HTTP_FORM_PARAM_END[] PROGMEM = "
"; +const char HTTP_SCAN_LINK[] PROGMEM = "
"; +const char HTTP_SAVED[] PROGMEM = "
";
-#define WIFI_MANAGER_MAX_PARAMS 20
+#define WIFI_MANAGER_MAX_PARAMS 10
#define WFM_LABEL_BEFORE 1
#define WFM_LABEL_AFTER 2
@@ -73,30 +95,34 @@ class WiFiManagerParameter {
class WiFiManager
{
public:
+ WiFiManager(Stream& consolePort);
WiFiManager();
+ ~WiFiManager();
- boolean autoConnect(boolean showStaticIPFields = false);
- boolean autoConnect(char const *apName, char const *apPassword = NULL, boolean showStaticIPFields = false);
+ boolean autoConnect();
+ boolean autoConnect(char const *apName, char const *apPassword = NULL);
//if you want to always start the config portal, without trying to connect first
boolean startConfigPortal();
boolean startConfigPortal(char const *apName, char const *apPassword = NULL);
+ boolean process();
+ void startWebPortal();
+ void stopWebPortal();
// get the AP name of the config portal, so it can be used in the callback
String getConfigPortalSSID();
void resetSettings();
- //sets timeout before webserver loop ends and exits even if there has been no setup.
- //usefully for devices that failed to connect at some point and got stuck in a webserver loop
+ //sets timeout before AP,webserver loop ends and exits even if there has been no setup.
+ //useful for devices that failed to connect at some point and got stuck in a webserver loop
//in seconds setConfigPortalTimeout is a new name for setTimeout
void setConfigPortalTimeout(unsigned long seconds);
- void setTimeout(unsigned long seconds);
+ void setTimeout(unsigned long seconds); // @deprecated, alias
- //sets timeout for which to attempt connecting, usefull if you get a lot of failed connects
+ //sets timeout for which to attempt connecting, useful if you get a lot of failed connects
void setConnectTimeout(unsigned long seconds);
-
void setDebugOutput(boolean debug);
//defaults to not showing anything under 8% signal quality if called
void setMinimumSignalQuality(int quality = 8);
@@ -110,14 +136,22 @@ class WiFiManager
void setSaveConfigCallback( void (*func)(void) );
//adds a custom parameter
void addParameter(WiFiManagerParameter *p);
- //if this is set, it will exit after config, even if connection is unsucessful.
+ //if this is set, it will exit after config, even if connection is unsuccessful.
void setBreakAfterConfig(boolean shouldBreak);
- //if this is set, try WPS setup when starting (this will delay config portal for up to 2 mins)
- //TODO
+ //if this is set, portal will be blocking and wait until save or exit, is false user must manually process to handle config portal
+ void setConfigPortalBlocking(boolean shouldBlock);
+
+
//if this is set, customise style
void setCustomHeadElement(const char* element);
//if this is true, remove duplicated Access Points - defaut true
void setRemoveDuplicateAPs(boolean removeDuplicates);
+ //setter for ESP wifi.persistent so we can remember it and restore user preference, as WIFi._persistent is protected
+ void setRestorePersistent(boolean persistent);
+ //if true, always show static net inputs, IP, subnet, gateway, if false, only show when already set.
+ void setShowStaticFields(boolean alwaysShow);
+ //if true disable captive portal redirection
+ void setCaptivePortalEnable(boolean enabled);
private:
std::unique_ptr"; +const char HTTP_ITEM[] PROGMEM = ""; +// const char HTTP_ITEM[] PROGMEM = "
{v} {R} {r}% {q} {e}
"; // test all tokens
+//const char HTTP_ITEM_PADLOCK[] PROGMEM = "";
+const char HTTP_FORM_START[] PROGMEM = "";
+const char HTTP_FORM_LABEL[] PROGMEM = "";
+const char HTTP_FORM_PARAM_START[] PROGMEM = ""; +const char HTTP_FORM_PARAM[] PROGMEM = "
"; +const char HTTP_FORM_PARAM_END[] PROGMEM = "
"; +const char HTTP_SCAN_LINK[] PROGMEM = "
"; +const char HTTP_SAVED[] PROGMEM = "
Saving Credentials
Trying to connect ESP to network.
If it fails reconnect to AP to try again
";
const char HTTP_END[] PROGMEM = "Trying to connect ESP to network.
If it fails reconnect to AP to try again