with IP "); - page += WiFi.localIP().toString(); - page += F(""); - } else { - page += "
";
- page += "Not Connected to ";
- page += WiFi_SSID();
- }
- } else {
- page += "
#include
-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";
+ str = FPSTR(HTTP_STATUS_ON);
+ str.replace("{u}",WiFi.localIP().toString());
+ str.replace("{s}",WiFi.SSID());
+ }
+ else {
+ str = FPSTR(HTTP_STATUS_OFF);
+ str.replace("{s}",WiFi.SSID());
+ }
}
- page += "
";
+ else {
+ str = FPSTR(HTTP_STATUS_NONE);
+ }
+ page += str;
}
/**
@@ -1190,12 +1197,7 @@ void WiFiManager::reportStatus(String &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);
+ String page = getHTTPHead("Reset"); //@token titlereset
page += F("Module will reset in a few seconds.");
page += FPSTR(HTTP_END);
@@ -1213,45 +1215,36 @@ void WiFiManager::handleReset() {
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;
+ String page = getHTTPHead("Erase"); // @token titleerase
page += FPSTR(HTTP_HEAD_END);
-
bool ret = WiFi_eraseConfig();
- if(!ret) DEBUG_WM(F("ERASE FAILED"));
-
- // bool ret = reset = true;
-
- if(ret) page += F("Module will reset in a few seconds.");
+
+ if(ret) page += F("Module will reset in a few seconds."); // @token resetting
else {
- page += F("An Error Occured");
- DEBUG_WM(F("WiFi EraseConfig reported an error"));
+ page += F("An Error Occured"); // @token erroroccur
+ DEBUG_WM(F("[ERROR] WiFi EraseConfig failed"));
}
page += FPSTR(HTTP_END);
server->sendHeader("Content-Length", String(page.length()));
server->send(200, "text/html", page);
- delay(2000);
if(ret){
+ delay(2000);
DEBUG_WM(F("RESETTING ESP"));
reboot();
}
}
void WiFiManager::handleNotFound() {
- if (captivePortal()) { // If captive portal redirect instead of displaying the error page.
- return;
- }
- String message = "File Not Found\n\n";
- message += "URI: ";
+ if (captivePortal()) return; // If captive portal redirect instead of displaying the page
+
+ String message = "File Not Found\n\n"; // @token notfound
+ message += "URI: "; // @token uri
message += server->uri();
- message += "\nMethod: ";
+ message += "\nMethod: "; // @token method
message += ( server->method() == HTTP_GET ) ? "GET" : "POST";
- message += "\nArguments: ";
+ message += "\nArguments: "; // @token args
message += server->args();
message += "\n";
@@ -1352,28 +1345,6 @@ void WiFiManager::DEBUG_WM(Generic text,Genericb textb) {
}
}
-/*
- 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(){
#ifdef ESP8266
softap_config config;
@@ -1396,9 +1367,9 @@ void WiFiManager::debugSoftAPConfig(){
void WiFiManager::debugPlatformInfo(){
#ifdef ESP8266
system_print_meminfo();
- DEBUG_WM("getCoreVersion(): ",ESP.getCoreVersion());
- DEBUG_WM("system_get_sdk_version(): ",system_get_sdk_version());
- DEBUG_WM("system_get_boot_version(): ",system_get_boot_version());
+ DEBUG_WM("getCoreVersion():",ESP.getCoreVersion());
+ DEBUG_WM("system_get_sdk_version():",system_get_sdk_version());
+ DEBUG_WM("system_get_boot_version():",system_get_boot_version());
#elif defined(ESP32)
size_t freeHeap = heap_caps_get_free_size(MALLOC_CAP_8BIT);
DEBUG_WM("Free heap: ", freeHeap);
diff --git a/WiFiManager.h b/WiFiManager.h
index 67833bb..035fbc5 100644
--- a/WiFiManager.h
+++ b/WiFiManager.h
@@ -48,43 +48,9 @@
#include ";
-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 10
+#ifndef WIFI_MANAGER_MAX_PARAMS
+ #define WIFI_MANAGER_MAX_PARAMS 5 // params will autoincrement and realloc by this amount when max is reached
+#endif
#define WFM_LABEL_BEFORE 1
#define WFM_LABEL_AFTER 2
@@ -92,10 +58,15 @@ const char HTTP_END[] PROGMEM = ""; -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