Update WiFiManager to 2.0.17
This commit is contained in:
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5)
|
|||||||
idf_component_register(
|
idf_component_register(
|
||||||
SRCS "WiFiManager.cpp"
|
SRCS "WiFiManager.cpp"
|
||||||
INCLUDE_DIRS "."
|
INCLUDE_DIRS "."
|
||||||
REQUIRES arduino
|
PRIV_REQUIRES arduino
|
||||||
)
|
)
|
||||||
|
|
||||||
project(WiFiManager)
|
project(WiFiManager)
|
||||||
|
|||||||
@@ -5,7 +5,8 @@ Espressif ESPx WiFi Connection manager with fallback web configuration portal
|
|||||||
|
|
||||||
:warning: This Documentation is out of date, see notes below
|
:warning: This Documentation is out of date, see notes below
|
||||||
|
|
||||||

|
<a name="release"></a>
|
||||||
|
[](#release)
|
||||||
|
|
||||||
[](https://github.com/tzapu/WiFiManager/actions/workflows/compile_library.yml)
|
[](https://github.com/tzapu/WiFiManager/actions/workflows/compile_library.yml)
|
||||||
|
|
||||||
@@ -20,6 +21,7 @@ Espressif ESPx WiFi Connection manager with fallback web configuration portal
|
|||||||
[](https://www.espressif.com/en/products/socs/esp32)
|
[](https://www.espressif.com/en/products/socs/esp32)
|
||||||
[](https://www.espressif.com/en/products/socs/esp32-s2)
|
[](https://www.espressif.com/en/products/socs/esp32-s2)
|
||||||
[](https://www.espressif.com/en/products/socs/esp32-c3)
|
[](https://www.espressif.com/en/products/socs/esp32-c3)
|
||||||
|
[](https://www.espressif.com/en/products/socs/esp32-S3)
|
||||||
|
|
||||||
Member to Member Support / Chat
|
Member to Member Support / Chat
|
||||||
|
|
||||||
@@ -28,15 +30,10 @@ Member to Member Support / Chat
|
|||||||
[](https://discord.gg/nS5WGkaQH5)
|
[](https://discord.gg/nS5WGkaQH5)
|
||||||
The configuration portal is of the captive variety, so on various devices it will present the configuration dialogue as soon as you connect to the created access point.
|
The configuration portal is of the captive variety, so on various devices it will present the configuration dialogue as soon as you connect to the created access point.
|
||||||
|
|
||||||
**This works with the ESP8266 Arduino platform**
|
Works with the [ESP8266 Arduino](https://github.com/esp8266/Arduino) and [ESP32 Arduino](https://github.com/espressif/arduino-esp32) platforms.
|
||||||
|
|
||||||
[https://github.com/esp8266/Arduino](https://github.com/esp8266/Arduino)
|
|
||||||
|
|
||||||
**This works with the ESP32 Arduino platform**
|
|
||||||
|
|
||||||
[https://github.com/espressif/arduino-esp32](https://github.com/espressif/arduino-esp32)
|
|
||||||
|
|
||||||
### Known Issues
|
### Known Issues
|
||||||
|
|
||||||
* Documentation needs to be updated, see [https://github.com/tzapu/WiFiManager/issues/500](https://github.com/tzapu/WiFiManager/issues/500)
|
* Documentation needs to be updated, see [https://github.com/tzapu/WiFiManager/issues/500](https://github.com/tzapu/WiFiManager/issues/500)
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -51,10 +51,10 @@
|
|||||||
// #warning ESP32S3
|
// #warning ESP32S3
|
||||||
// #endif
|
// #endif
|
||||||
|
|
||||||
#if defined(ARDUINO_ESP32S3_DEV) || defined(CONFIG_IDF_TARGET_ESP32S3)
|
// #if defined(ARDUINO_ESP32S3_DEV) || defined(CONFIG_IDF_TARGET_ESP32S3)
|
||||||
#warning "WM_NOTEMP"
|
// #warning "WM_NOTEMP"
|
||||||
#define WM_NOTEMP // disabled temp sensor, have to determine which chip we are on
|
// #define WM_NOTEMP // disabled temp sensor, have to determine which chip we are on
|
||||||
#endif
|
// #endif
|
||||||
|
|
||||||
// #include "soc/efuse_reg.h" // include to add efuse chip rev to info, getChipRevision() is almost always the same though, so not sure why it matters.
|
// #include "soc/efuse_reg.h" // include to add efuse chip rev to info, getChipRevision() is almost always the same though, so not sure why it matters.
|
||||||
|
|
||||||
@@ -222,24 +222,32 @@ class WiFiManagerParameter {
|
|||||||
protected:
|
protected:
|
||||||
void init(const char *id, const char *label, const char *defaultValue, int length, const char *custom, int labelPlacement);
|
void init(const char *id, const char *label, const char *defaultValue, int length, const char *custom, int labelPlacement);
|
||||||
|
|
||||||
private:
|
|
||||||
WiFiManagerParameter& operator=(const WiFiManagerParameter&);
|
WiFiManagerParameter& operator=(const WiFiManagerParameter&);
|
||||||
const char *_id;
|
const char *_id;
|
||||||
const char *_label;
|
const char *_label;
|
||||||
char *_value;
|
char *_value;
|
||||||
int _length;
|
int _length;
|
||||||
int _labelPlacement;
|
int _labelPlacement;
|
||||||
protected:
|
|
||||||
const char *_customHTML;
|
const char *_customHTML;
|
||||||
friend class WiFiManager;
|
friend class WiFiManager;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
// debugging
|
||||||
|
typedef enum {
|
||||||
|
WM_DEBUG_SILENT = 0, // debug OFF but still compiled for runtime
|
||||||
|
WM_DEBUG_ERROR = 1, // error only
|
||||||
|
WM_DEBUG_NOTIFY = 2, // default stable,INFO
|
||||||
|
WM_DEBUG_VERBOSE = 3, // move verbose info
|
||||||
|
WM_DEBUG_DEV = 4, // development useful debugging info
|
||||||
|
WM_DEBUG_MAX = 5 // MAX extra dev auditing, var dumps etc (MAX+1 will print timing,mem and frag info)
|
||||||
|
} wm_debuglevel_t;
|
||||||
|
|
||||||
class WiFiManager
|
class WiFiManager
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
WiFiManager(Print& consolePort);
|
WiFiManager(Print& consolePort);
|
||||||
WiFiManager(const char* user, const char* password);
|
|
||||||
WiFiManager();
|
WiFiManager();
|
||||||
~WiFiManager();
|
~WiFiManager();
|
||||||
void WiFiManagerInit();
|
void WiFiManagerInit();
|
||||||
@@ -340,6 +348,7 @@ class WiFiManager
|
|||||||
// toggle debug output
|
// toggle debug output
|
||||||
void setDebugOutput(boolean debug);
|
void setDebugOutput(boolean debug);
|
||||||
void setDebugOutput(boolean debug, String prefix); // log line prefix, default "*wm:"
|
void setDebugOutput(boolean debug, String prefix); // log line prefix, default "*wm:"
|
||||||
|
void setDebugOutput(boolean debug, wm_debuglevel_t level ); // log line prefix, default "*wm:"
|
||||||
|
|
||||||
//set min quality percentage to include in scan, defaults to 8% if not specified
|
//set min quality percentage to include in scan, defaults to 8% if not specified
|
||||||
void setMinimumSignalQuality(int quality = 8);
|
void setMinimumSignalQuality(int quality = 8);
|
||||||
@@ -499,7 +508,7 @@ class WiFiManager
|
|||||||
|
|
||||||
std::unique_ptr<WM_WebServer> server;
|
std::unique_ptr<WM_WebServer> server;
|
||||||
|
|
||||||
private:
|
protected:
|
||||||
// vars
|
// vars
|
||||||
std::vector<uint8_t> _menuIds;
|
std::vector<uint8_t> _menuIds;
|
||||||
std::vector<const char *> _menuIdsParams = {"wifi","param","info","exit"};
|
std::vector<const char *> _menuIdsParams = {"wifi","param","info","exit"};
|
||||||
@@ -550,7 +559,7 @@ class WiFiManager
|
|||||||
uint16_t _httpPort = 80; // port for webserver
|
uint16_t _httpPort = 80; // port for webserver
|
||||||
// uint8_t _retryCount = 0; // counter for retries, probably not needed if synchronous
|
// uint8_t _retryCount = 0; // counter for retries, probably not needed if synchronous
|
||||||
uint8_t _connectRetries = 1; // number of sta connect retries, force reconnect, wait loop (connectimeout) does not always work and first disconnect bails
|
uint8_t _connectRetries = 1; // number of sta connect retries, force reconnect, wait loop (connectimeout) does not always work and first disconnect bails
|
||||||
bool _aggresiveReconn = true; // use an agrressive reconnect strategy, WILL delay conxs
|
bool _aggresiveReconn = false; // use an agrressive reconnect strategy, WILL delay conxs
|
||||||
// on some conn failure modes will add delays and many retries to work around esp and ap bugs, ie, anti de-auth protections
|
// on some conn failure modes will add delays and many retries to work around esp and ap bugs, ie, anti de-auth protections
|
||||||
// https://github.com/tzapu/WiFiManager/issues/1067
|
// https://github.com/tzapu/WiFiManager/issues/1067
|
||||||
bool _allowExit = true; // allow exit in nonblocking, else user exit/abort calls will be ignored including cptimeout
|
bool _allowExit = true; // allow exit in nonblocking, else user exit/abort calls will be ignored including cptimeout
|
||||||
@@ -608,9 +617,15 @@ class WiFiManager
|
|||||||
// but not limited to, we could run continuous background scans on various page hits, or xhr hits
|
// but not limited to, we could run continuous background scans on various page hits, or xhr hits
|
||||||
// which would be better coupled with asyncscan
|
// which would be better coupled with asyncscan
|
||||||
// atm preload is only done on root hit and startcp
|
// atm preload is only done on root hit and startcp
|
||||||
boolean _preloadwifiscan = true; // preload wifiscan if true
|
//
|
||||||
|
// preload scanning causes AP to delay showing for users, but also caches and lets the cp load faster once its open
|
||||||
|
// my scan takes 7-10 seconds
|
||||||
|
public:
|
||||||
|
boolean _preloadwifiscan = false; // preload wifiscan if true
|
||||||
unsigned int _scancachetime = 30000; // ms cache time for preload scans
|
unsigned int _scancachetime = 30000; // ms cache time for preload scans
|
||||||
boolean _asyncScan = true; // perform wifi network scan async
|
boolean _asyncScan = false; // perform wifi network scan async
|
||||||
|
|
||||||
|
protected:
|
||||||
|
|
||||||
boolean _autoforcerescan = false; // automatically force rescan if scan networks is 0, ignoring cache
|
boolean _autoforcerescan = false; // automatically force rescan if scan networks is 0, ignoring cache
|
||||||
|
|
||||||
@@ -647,13 +662,16 @@ class WiFiManager
|
|||||||
void updateConxResult(uint8_t status);
|
void updateConxResult(uint8_t status);
|
||||||
|
|
||||||
// webserver handlers
|
// webserver handlers
|
||||||
void HTTPSend(String content);
|
public:
|
||||||
|
void handleNotFound();
|
||||||
|
protected:
|
||||||
|
void HTTPSend(const String &content);
|
||||||
void handleRoot();
|
void handleRoot();
|
||||||
void handleWifi(boolean scan);
|
void handleWifi(boolean scan);
|
||||||
void handleWifiSave();
|
void handleWifiSave();
|
||||||
void handleInfo();
|
void handleInfo();
|
||||||
void handleReset();
|
void handleReset();
|
||||||
void handleNotFound();
|
|
||||||
void handleExit();
|
void handleExit();
|
||||||
void handleClose();
|
void handleClose();
|
||||||
// void handleErase();
|
// void handleErase();
|
||||||
@@ -748,8 +766,15 @@ class WiFiManager
|
|||||||
boolean abort = false;
|
boolean abort = false;
|
||||||
boolean reset = false;
|
boolean reset = false;
|
||||||
boolean configPortalActive = false;
|
boolean configPortalActive = false;
|
||||||
|
|
||||||
|
|
||||||
|
// these are state flags for portal mode, we are either in webportal mode(STA) or configportal mode(AP)
|
||||||
|
// these are mutually exclusive as STA+AP mode is not supported due to channel restrictions and stability
|
||||||
|
// if we decide to support this, these checks will need to be replaced with something client aware to check if client origin is ap or web
|
||||||
|
// These state checks are critical and used for internal function checks
|
||||||
boolean webPortalActive = false;
|
boolean webPortalActive = false;
|
||||||
boolean portalTimeoutResult = false;
|
boolean portalTimeoutResult = false;
|
||||||
|
|
||||||
boolean portalAbortResult = false;
|
boolean portalAbortResult = false;
|
||||||
boolean storeSTAmode = true; // option store persistent STA mode in connectwifi
|
boolean storeSTAmode = true; // option store persistent STA mode in connectwifi
|
||||||
int timer = 0; // timer for debug throttle for numclients, and portal timeout messages
|
int timer = 0; // timer for debug throttle for numclients, and portal timeout messages
|
||||||
@@ -759,26 +784,17 @@ class WiFiManager
|
|||||||
int _max_params;
|
int _max_params;
|
||||||
WiFiManagerParameter** _params = NULL;
|
WiFiManagerParameter** _params = NULL;
|
||||||
|
|
||||||
// debugging
|
|
||||||
typedef enum {
|
|
||||||
DEBUG_ERROR = 0,
|
|
||||||
DEBUG_NOTIFY = 1, // default stable
|
|
||||||
DEBUG_VERBOSE = 2,
|
|
||||||
DEBUG_DEV = 3, // default dev
|
|
||||||
DEBUG_MAX = 4
|
|
||||||
} wm_debuglevel_t;
|
|
||||||
|
|
||||||
boolean _debug = true;
|
boolean _debug = true;
|
||||||
String _debugPrefix = FPSTR(S_debugPrefix);
|
String _debugPrefix = FPSTR(S_debugPrefix);
|
||||||
|
|
||||||
wm_debuglevel_t debugLvlShow = DEBUG_VERBOSE; // at which level start showing [n] level tags
|
wm_debuglevel_t debugLvlShow = WM_DEBUG_VERBOSE; // at which level start showing [n] level tags
|
||||||
|
|
||||||
// build debuglevel support
|
// build debuglevel support
|
||||||
// @todo use DEBUG_ESP_x?
|
// @todo use DEBUG_ESP_x?
|
||||||
|
|
||||||
// Set default debug level
|
// Set default debug level
|
||||||
#ifndef WM_DEBUG_LEVEL
|
#ifndef WM_DEBUG_LEVEL
|
||||||
#define WM_DEBUG_LEVEL DEBUG_NOTIFY
|
#define WM_DEBUG_LEVEL WM_DEBUG_NOTIFY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// override debug level OFF
|
// override debug level OFF
|
||||||
@@ -821,10 +837,6 @@ class WiFiManager
|
|||||||
std::function<void()> _preotaupdatecallback;
|
std::function<void()> _preotaupdatecallback;
|
||||||
std::function<void()> _configportaltimeoutcallback;
|
std::function<void()> _configportaltimeoutcallback;
|
||||||
|
|
||||||
bool _hasCredentials = false;
|
|
||||||
char _credUser[31] = {0};
|
|
||||||
char _credPassword[31] = {0};
|
|
||||||
|
|
||||||
template <class T>
|
template <class T>
|
||||||
auto optionalIPFromString(T *obj, const char *s) -> decltype( obj->fromString(s) ) {
|
auto optionalIPFromString(T *obj, const char *s) -> decltype( obj->fromString(s) ) {
|
||||||
return obj->fromString(s);
|
return obj->fromString(s);
|
||||||
|
|||||||
@@ -31,6 +31,8 @@ bool ALLOWONDEMAND = true; // enable on demand
|
|||||||
int ONDDEMANDPIN = 0; // gpio for button
|
int ONDDEMANDPIN = 0; // gpio for button
|
||||||
bool WMISBLOCKING = true; // use blocking or non blocking mode, non global params wont work in non blocking
|
bool WMISBLOCKING = true; // use blocking or non blocking mode, non global params wont work in non blocking
|
||||||
|
|
||||||
|
uint8_t BUTTONFUNC = 1; // 0 resetsettings, 1 configportal, 2 autoconnect
|
||||||
|
|
||||||
// char ssid[] = "*************"; // your network SSID (name)
|
// char ssid[] = "*************"; // your network SSID (name)
|
||||||
// char pass[] = "********"; // your network password
|
// char pass[] = "********"; // your network password
|
||||||
|
|
||||||
@@ -72,15 +74,24 @@ void saveParamCallback(){
|
|||||||
}
|
}
|
||||||
|
|
||||||
void bindServerCallback(){
|
void bindServerCallback(){
|
||||||
wm.server->on("/custom",handleRoute); // this is now crashing esp32 for some reason
|
wm.server->on("/custom",handleRoute);
|
||||||
// wm.server->on("/info",handleRoute); // you can override wm!
|
|
||||||
|
// you can override wm route endpoints, I have not found a way to remove handlers, but this would let you disable them or add auth etc.
|
||||||
|
// wm.server->on("/info",handleNotFound);
|
||||||
|
// wm.server->on("/update",handleNotFound);
|
||||||
|
wm.server->on("/erase",handleNotFound); // disable erase
|
||||||
}
|
}
|
||||||
|
|
||||||
void handleRoute(){
|
void handleRoute(){
|
||||||
Serial.println("[HTTP] handle route");
|
Serial.println("[HTTP] handle custom route");
|
||||||
wm.server->send(200, "text/plain", "hello from user code");
|
wm.server->send(200, "text/plain", "hello from user code");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void handleNotFound(){
|
||||||
|
Serial.println("[HTTP] override handle route");
|
||||||
|
wm.handleNotFound();
|
||||||
|
}
|
||||||
|
|
||||||
void handlePreOtaUpdateCallback(){
|
void handlePreOtaUpdateCallback(){
|
||||||
Update.onProgress([](unsigned int progress, unsigned int total) {
|
Update.onProgress([](unsigned int progress, unsigned int total) {
|
||||||
Serial.printf("CUSTOM Progress: %u%%\r", (progress / (total / 100)));
|
Serial.printf("CUSTOM Progress: %u%%\r", (progress / (total / 100)));
|
||||||
@@ -92,9 +103,11 @@ void setup() {
|
|||||||
|
|
||||||
// put your setup code here, to run once:
|
// put your setup code here, to run once:
|
||||||
Serial.begin(115200);
|
Serial.begin(115200);
|
||||||
|
delay(3000);
|
||||||
// Serial.setDebugOutput(true);
|
// Serial.setDebugOutput(true);
|
||||||
|
|
||||||
|
// WiFi.setTxPower(WIFI_POWER_8_5dBm);
|
||||||
|
|
||||||
Serial.println("\n Starting");
|
Serial.println("\n Starting");
|
||||||
// WiFi.setSleepMode(WIFI_NONE_SLEEP); // disable sleep, can improve ap stability
|
// WiFi.setSleepMode(WIFI_NONE_SLEEP); // disable sleep, can improve ap stability
|
||||||
|
|
||||||
@@ -109,7 +122,7 @@ void setup() {
|
|||||||
// WiFi.setSortMethod(WIFI_CONNECT_AP_BY_SIGNAL); // wifi_sort_method_t sortMethod - WIFI_CONNECT_AP_BY_SIGNAL,WIFI_CONNECT_AP_BY_SECURITY
|
// WiFi.setSortMethod(WIFI_CONNECT_AP_BY_SIGNAL); // wifi_sort_method_t sortMethod - WIFI_CONNECT_AP_BY_SIGNAL,WIFI_CONNECT_AP_BY_SECURITY
|
||||||
// WiFi.setMinSecurity(WIFI_AUTH_WPA2_PSK);
|
// WiFi.setMinSecurity(WIFI_AUTH_WPA2_PSK);
|
||||||
|
|
||||||
wm.setDebugOutput(true);
|
wm.setDebugOutput(true, WM_DEBUG_DEV);
|
||||||
wm.debugPlatformInfo();
|
wm.debugPlatformInfo();
|
||||||
|
|
||||||
//reset settings - for testing
|
//reset settings - for testing
|
||||||
@@ -127,7 +140,7 @@ void setup() {
|
|||||||
WiFiManagerParameter custom_input_type("input_pwd", "input pass", "", 15,"type='password'"); // custom input attrs (ip mask)
|
WiFiManagerParameter custom_input_type("input_pwd", "input pass", "", 15,"type='password'"); // custom input attrs (ip mask)
|
||||||
|
|
||||||
const char _customHtml_checkbox[] = "type=\"checkbox\"";
|
const char _customHtml_checkbox[] = "type=\"checkbox\"";
|
||||||
WiFiManagerParameter custom_checkbox("my_checkbox", "My Checkbox", "T", 2, _customHtml_checkbox,WFM_LABEL_AFTER);
|
WiFiManagerParameter custom_checkbox("my_checkbox", "My Checkbox", "T", 2, _customHtml_checkbox, WFM_LABEL_AFTER);
|
||||||
|
|
||||||
const char *bufferStr = R"(
|
const char *bufferStr = R"(
|
||||||
<!-- INPUT CHOICE -->
|
<!-- INPUT CHOICE -->
|
||||||
@@ -205,7 +218,7 @@ void setup() {
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
std::vector<const char *> menu = {"wifi","wifinoscan","info","param","custom","close","sep","erase","update","restart","exit"};
|
std::vector<const char *> menu = {"wifi","wifinoscan","info","param","custom","close","sep","erase","update","restart","exit"};
|
||||||
wm.setMenu(menu); // custom menu, pass vector
|
// wm.setMenu(menu); // custom menu, pass vector
|
||||||
|
|
||||||
// wm.setParamsPage(true); // move params to seperate page, not wifi, do not combine with setmenu!
|
// wm.setParamsPage(true); // move params to seperate page, not wifi, do not combine with setmenu!
|
||||||
|
|
||||||
@@ -226,7 +239,7 @@ void setup() {
|
|||||||
|
|
||||||
// set Hostname
|
// set Hostname
|
||||||
|
|
||||||
wm.setHostname(("WM_"+wm.getDefaultAPName()).c_str());
|
// wm.setHostname(("WM_"+wm.getDefaultAPName()).c_str());
|
||||||
// wm.setHostname("WM_RANDO_1234");
|
// wm.setHostname("WM_RANDO_1234");
|
||||||
|
|
||||||
// set custom channel
|
// set custom channel
|
||||||
@@ -245,9 +258,10 @@ void setup() {
|
|||||||
wm.setConfigPortalBlocking(false);
|
wm.setConfigPortalBlocking(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//sets timeout until configuration portal gets turned off
|
//sets timeout until configuration portal gets turned off
|
||||||
//useful to make it all retry or go to sleep in seconds
|
//useful to make it all retry or go to sleep in seconds
|
||||||
wm.setConfigPortalTimeout(120);
|
wm.setConfigPortalTimeout(TESP_CP_TIMEOUT);
|
||||||
|
|
||||||
// set min quality to show in web list, default 8%
|
// set min quality to show in web list, default 8%
|
||||||
// wm.setMinimumSignalQuality(50);
|
// wm.setMinimumSignalQuality(50);
|
||||||
@@ -313,12 +327,13 @@ void setup() {
|
|||||||
|
|
||||||
void wifiInfo(){
|
void wifiInfo(){
|
||||||
// can contain gargbage on esp32 if wifi is not ready yet
|
// can contain gargbage on esp32 if wifi is not ready yet
|
||||||
Serial.println("[WIFI] WIFI INFO DEBUG");
|
Serial.println("[WIFI] WIFI_INFO DEBUG");
|
||||||
// WiFi.printDiag(Serial);
|
WiFi.printDiag(Serial);
|
||||||
|
Serial.println("[WIFI] MODE: " + (String)(wm.getModeString(WiFi.getMode())));
|
||||||
Serial.println("[WIFI] SAVED: " + (String)(wm.getWiFiIsSaved() ? "YES" : "NO"));
|
Serial.println("[WIFI] SAVED: " + (String)(wm.getWiFiIsSaved() ? "YES" : "NO"));
|
||||||
Serial.println("[WIFI] SSID: " + (String)wm.getWiFiSSID());
|
Serial.println("[WIFI] SSID: " + (String)wm.getWiFiSSID());
|
||||||
Serial.println("[WIFI] PASS: " + (String)wm.getWiFiPass());
|
Serial.println("[WIFI] PASS: " + (String)wm.getWiFiPass());
|
||||||
Serial.println("[WIFI] HOSTNAME: " + (String)WiFi.getHostname());
|
// Serial.println("[WIFI] HOSTNAME: " + (String)WiFi.getHostname());
|
||||||
}
|
}
|
||||||
|
|
||||||
void loop() {
|
void loop() {
|
||||||
@@ -327,31 +342,40 @@ void loop() {
|
|||||||
wm.process();
|
wm.process();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifdef USEOTA
|
#ifdef USEOTA
|
||||||
ArduinoOTA.handle();
|
ArduinoOTA.handle();
|
||||||
#endif
|
#endif
|
||||||
// is configuration portal requested?
|
// is configuration portal requested?
|
||||||
if (ALLOWONDEMAND && digitalRead(ONDDEMANDPIN) == LOW ) {
|
if (ALLOWONDEMAND && digitalRead(ONDDEMANDPIN) == LOW ) {
|
||||||
delay(100);
|
delay(100);
|
||||||
if ( digitalRead(ONDDEMANDPIN) == LOW ){
|
if ( digitalRead(ONDDEMANDPIN) == LOW || BUTTONFUNC == 2){
|
||||||
Serial.println("BUTTON PRESSED");
|
Serial.println("BUTTON PRESSED");
|
||||||
|
|
||||||
// button reset/reboot
|
// button reset/reboot
|
||||||
// wm.resetSettings();
|
if(BUTTONFUNC == 0){
|
||||||
// wm.reboot();
|
wm.resetSettings();
|
||||||
// delay(200);
|
wm.reboot();
|
||||||
// return;
|
delay(200);
|
||||||
|
return;
|
||||||
wm.setConfigPortalTimeout(140);
|
|
||||||
wm.setParamsPage(false); // move params to seperate page, not wifi, do not combine with setmenu!
|
|
||||||
|
|
||||||
// disable captive portal redirection
|
|
||||||
// wm.setCaptivePortalEnable(false);
|
|
||||||
|
|
||||||
if (!wm.startConfigPortal("OnDemandAP","12345678")) {
|
|
||||||
Serial.println("failed to connect and hit timeout");
|
|
||||||
delay(3000);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// start configportal
|
||||||
|
if(BUTTONFUNC == 1){
|
||||||
|
if (!wm.startConfigPortal("OnDemandAP","12345678")) {
|
||||||
|
Serial.println("failed to connect and hit timeout");
|
||||||
|
delay(3000);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
//test autoconnect as reconnect etc.
|
||||||
|
if(BUTTONFUNC == 2){
|
||||||
|
wm.setConfigPortalTimeout(TESP_CP_TIMEOUT);
|
||||||
|
wm.autoConnect();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
//if you get here you have connected to the WiFi
|
//if you get here you have connected to the WiFi
|
||||||
|
|||||||
@@ -227,6 +227,7 @@ button:hover{
|
|||||||
<form action='/erase' method='post'><button class='D'>Erase</button></form><br/>
|
<form action='/erase' method='post'><button class='D'>Erase</button></form><br/>
|
||||||
<form action='/restart' method='post'><button>Restart</button></form><br/>
|
<form action='/restart' method='post'><button>Restart</button></form><br/>
|
||||||
<form action='/exit' method='post'><button>Exit</button></form><br/>
|
<form action='/exit' method='post'><button>Exit</button></form><br/>
|
||||||
|
<form action='/exit' method='post'><button>Update</button></form><br/>
|
||||||
<form action='/' method='post'><button>Back</button></form><br/>
|
<form action='/' method='post'><button>Back</button></form><br/>
|
||||||
<!-- /HTTP_PORTAL_MENU -->
|
<!-- /HTTP_PORTAL_MENU -->
|
||||||
<!-- SAMPLE -->
|
<!-- SAMPLE -->
|
||||||
@@ -251,7 +252,7 @@ button:hover{
|
|||||||
<div><a href='#p' onclick='c(this)'>{v}</a><div role='img' aria-label='{r}%' title='{r}%' class='q q-{q} {i}'></div></div>
|
<div><a href='#p' onclick='c(this)'>{v}</a><div role='img' aria-label='{r}%' title='{r}%' class='q q-{q} {i}'></div></div>
|
||||||
<!-- /HTTP_ITEM -->
|
<!-- /HTTP_ITEM -->
|
||||||
<!-- HTTP_FORM_START -->
|
<!-- HTTP_FORM_START -->
|
||||||
<form method='get' action='wifisave'><label for='s'>SSID</label><br/><input id='s' name='s' length=32 placeholder='SSID'><br/><label for='p'>Password</label><input id='p' name='p' length=64 type='password' placeholder='password'><input type='checkbox' onclick='f()'> Show Password<br/>
|
<form method='get' action='wifisave'><label for='s'>SSID</label><br/><input id='s' name='s' length=32 placeholder='SSID'><br/><label for='p'>Password</label><input id='p' name='p' length=64 type='password' placeholder='password'><input type='checkbox' id='show-password' onclick='f()'> <label for='show-password'>Show Password</label><br/>
|
||||||
<!-- /HTTP_FORM_START -->
|
<!-- /HTTP_FORM_START -->
|
||||||
<!-- SAMPLE -->
|
<!-- SAMPLE -->
|
||||||
<h3>custom parameter</h3><hr>
|
<h3>custom parameter</h3><hr>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "WiFiManager",
|
"name": "WiFiManager",
|
||||||
"version": "2.0.15-rc.1",
|
"version": "2.0.17",
|
||||||
"keywords": "wifi,wi-fi,esp,esp8266,esp32,espressif8266,espressif32,nodemcu,wemos,arduino",
|
"keywords": "wifi,wi-fi,esp,esp8266,esp32,espressif8266,espressif32,nodemcu,wemos,arduino",
|
||||||
"description": "WiFi Configuration manager with web configuration portal for ESP boards",
|
"description": "WiFi Configuration manager with web configuration portal for ESP boards",
|
||||||
"authors":
|
"authors":
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
name=WiFiManager
|
name=WiFiManager
|
||||||
version=2.0.15-rc.1
|
version=2.0.17
|
||||||
author=tzapu
|
author=tzapu
|
||||||
maintainer=tablatronix
|
maintainer=tablatronix
|
||||||
sentence=WiFi Configuration manager with web configuration portal for Espressif ESPx boards, by tzapu
|
sentence=WiFi Configuration manager with web configuration portal for Espressif ESPx boards, by tzapu
|
||||||
|
|||||||
@@ -17,22 +17,34 @@
|
|||||||
// -----------------------------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------------------------
|
||||||
// TOKENS
|
// TOKENS
|
||||||
|
|
||||||
const char WM_VERSION_STR[] PROGMEM = "v2.0.15-rc.1";
|
const char WM_VERSION_STR[] PROGMEM = "v2.0.17";
|
||||||
|
|
||||||
const uint8_t _nummenutokens = 11;
|
static const char _wifi_token[] PROGMEM = "wifi";
|
||||||
const char * const _menutokens[_nummenutokens] PROGMEM = {
|
static const char _wifinoscan_token[] PROGMEM = "wifinoscan";
|
||||||
"wifi",
|
static const char _info_token[] PROGMEM = "info";
|
||||||
"wifinoscan",
|
static const char _param_token[] PROGMEM = "param";
|
||||||
"info",
|
static const char _close_token[] PROGMEM = "close";
|
||||||
"param",
|
static const char _restart_token[] PROGMEM = "restart";
|
||||||
"close",
|
static const char _exit_token[] PROGMEM = "exit";
|
||||||
"restart",
|
static const char _erase_token[] PROGMEM = "erase";
|
||||||
"exit",
|
static const char _update_token[] PROGMEM = "update";
|
||||||
"erase",
|
static const char _sep_token[] PROGMEM = "sep";
|
||||||
"update",
|
static const char _custom_token[] PROGMEM = "custom";
|
||||||
"sep",
|
static PGM_P _menutokens[] PROGMEM = {
|
||||||
"custom"
|
_wifi_token,
|
||||||
|
_wifinoscan_token,
|
||||||
|
_info_token,
|
||||||
|
_param_token,
|
||||||
|
_close_token,
|
||||||
|
_restart_token,
|
||||||
|
_exit_token,
|
||||||
|
_erase_token,
|
||||||
|
_update_token,
|
||||||
|
_sep_token,
|
||||||
|
_custom_token
|
||||||
};
|
};
|
||||||
|
const uint8_t _nummenutokens = (sizeof(_menutokens) / sizeof(PGM_P));
|
||||||
|
|
||||||
|
|
||||||
const char R_root[] PROGMEM = "/";
|
const char R_root[] PROGMEM = "/";
|
||||||
const char R_wifi[] PROGMEM = "/wifi";
|
const char R_wifi[] PROGMEM = "/wifi";
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ const char HTTP_ITEM[] PROGMEM = "<div><a href='#p' onclick='c(this)
|
|||||||
// const char HTTP_ITEM[] PROGMEM = "<div><a href='#p' onclick='c(this)'>{v}</a> {R} {r}% {q} {e}</div>"; // test all tokens
|
// const char HTTP_ITEM[] PROGMEM = "<div><a href='#p' onclick='c(this)'>{v}</a> {R} {r}% {q} {e}</div>"; // test all tokens
|
||||||
|
|
||||||
const char HTTP_FORM_START[] PROGMEM = "<form method='POST' action='{v}'>";
|
const char HTTP_FORM_START[] PROGMEM = "<form method='POST' action='{v}'>";
|
||||||
const char HTTP_FORM_WIFI[] PROGMEM = "<label for='s'>SSID</label><input id='s' name='s' maxlength='32' autocorrect='off' autocapitalize='none' placeholder='{v}'><br/><label for='p'>Password</label><input id='p' name='p' maxlength='64' type='password' placeholder='{p}'><input type='checkbox' onclick='f()'> Show Password";
|
const char HTTP_FORM_WIFI[] PROGMEM = "<label for='s'>SSID</label><input id='s' name='s' maxlength='32' autocorrect='off' autocapitalize='none' placeholder='{v}'><br/><label for='p'>Password</label><input id='p' name='p' maxlength='64' type='password' placeholder='{p}'><input type='checkbox' id='showpass' onclick='f()'> <label for='showpass'>Show Password</label><br/>";
|
||||||
const char HTTP_FORM_WIFI_END[] PROGMEM = "";
|
const char HTTP_FORM_WIFI_END[] PROGMEM = "";
|
||||||
const char HTTP_FORM_STATIC_HEAD[] PROGMEM = "<hr><br/>";
|
const char HTTP_FORM_STATIC_HEAD[] PROGMEM = "<hr><br/>";
|
||||||
const char HTTP_FORM_END[] PROGMEM = "<br/><br/><button type='submit'>Save</button></form>";
|
const char HTTP_FORM_END[] PROGMEM = "<br/><br/><button type='submit'>Save</button></form>";
|
||||||
|
|||||||
282
lib/WiFiManager/wm_strings_es.h
Normal file
282
lib/WiFiManager/wm_strings_es.h
Normal file
@@ -0,0 +1,282 @@
|
|||||||
|
/**
|
||||||
|
* SAMPLE SAMPLE SAMPLE
|
||||||
|
*
|
||||||
|
* wm_strings_es.h
|
||||||
|
* spanish strings for
|
||||||
|
* WiFiManager, a library for the ESPX/Arduino platform
|
||||||
|
* for configuration of WiFi credentials using a Captive Portal
|
||||||
|
*
|
||||||
|
* @author Creator tzapu
|
||||||
|
* @author tablatronix
|
||||||
|
* @version 0.0.0
|
||||||
|
* @license MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _WM_STRINGS_EN_H_
|
||||||
|
#define _WM_STRINGS_EN_H_
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ADD TO BUILD FLAGS
|
||||||
|
* -DWM_STRINGS_FILE="\"wm_strings_es.h\""
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef WIFI_MANAGER_OVERRIDE_STRINGS
|
||||||
|
// !!! ABOVE WILL NOT WORK if you define in your sketch, must be build flag, if anyone one knows how to order includes to be able to do this it would be neat.. I have seen it done..
|
||||||
|
|
||||||
|
// strings files must include a consts file!
|
||||||
|
// Copy and change to custom locale tokens if necessary, but strings should be good enough
|
||||||
|
#include "wm_consts_en.h" // include constants, tokens, routes
|
||||||
|
|
||||||
|
const char WM_LANGUAGE[] PROGMEM = "es-ES"; // i18n lang code
|
||||||
|
|
||||||
|
const char HTTP_HEAD_START[] PROGMEM = "<!DOCTYPE html>"
|
||||||
|
"<html lang='en'><head>"
|
||||||
|
"<meta name='format-detection' content='telephone=no'>"
|
||||||
|
"<meta charset='UTF-8'>"
|
||||||
|
"<meta name='viewport' content='width=device-width,initial-scale=1,user-scalable=no'/>"
|
||||||
|
"<title>{v}</title>";
|
||||||
|
|
||||||
|
const char HTTP_SCRIPT[] PROGMEM = "<script>function c(l){"
|
||||||
|
"document.getElementById('s').value=l.getAttribute('data-ssid')||l.innerText||l.textContent;"
|
||||||
|
"p = l.nextElementSibling.classList.contains('l');"
|
||||||
|
"document.getElementById('p').disabled = !p;"
|
||||||
|
"if(p)document.getElementById('p').focus();};"
|
||||||
|
"function f() {var x = document.getElementById('p');x.type==='password'?x.type='text':x.type='password';}"
|
||||||
|
"</script>"; // @todo add button states, disable on click , show ack , spinner etc
|
||||||
|
|
||||||
|
const char HTTP_HEAD_END[] PROGMEM = "</head><body class='{c}'><div class='wrap'>"; // {c} = _bodyclass
|
||||||
|
// example of embedded logo, base64 encoded inline, No styling here
|
||||||
|
// const char HTTP_ROOT_MAIN[] PROGMEM = "<img title=' alt=' src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAADQElEQVRoQ+2YjW0VQQyE7Q6gAkgFkAogFUAqgFQAVACpAKiAUAFQAaECQgWECggVGH1PPrRvn3dv9/YkFOksoUhhfzwz9ngvKrc89JbnLxuA/63gpsCmwCADWwkNEji8fVNgotDM7osI/x777x5l9F6JyB8R4eeVql4P0y8yNsjM7KGIPBORp558T04A+CwiH1UVUItiUQmZ2XMReSEiAFgjAPBeVS96D+sCYGaUx4cFbLfmhSpnqnrZuqEJgJnd8cQplVLciAgX//Cf0ToIeOB9wpmloLQAwpnVmAXgdf6pwjpJIz+XNoeZQQZlODV9vhc1Tuf6owrAk/8qIhFbJH7eI3eEzsvydQEICqBEkZwiALfF70HyHPpqScPV5HFjeFu476SkRA0AzOfy4hYwstj2ZkDgaphE7m6XqnoS7Q0BOPs/sw0kDROzjdXcCMFCNwzIy0EcRcOvBACfh4k0wgOmBX4xjfmk4DKTS31hgNWIKBCI8gdzogTgjYjQWFMw+o9LzJoZ63GUmjWm2wGDc7EvDDOj/1IVMIyD9SUAL0WEhpriRlXv5je5S+U1i2N88zdPuoVkeB+ls4SyxCoP3kVm9jsjpEsBLoOBNC5U9SwpGdakFkviuFP1keblATkTENTYcxkzgxTKOI3jyDxqLkQT87pMA++H3XvJBYtsNbBN6vuXq5S737WqHkW1VgMQNXJ0RshMqbbT33sJ5kpHWymzcJjNTeJIymJZtSQd9NHQHS1vodoFoTMkfbJzpRnLzB2vi6BZAJxWaCr+62BC+jzAxVJb3dmmiLzLwZhZNPE5e880Suo2AZgB8e8idxherqUPnT3brBDTlPxO3Z66rVwIwySXugdNd+5ejhqp/+NmgIwGX3Py3QBmlEi54KlwmjkOytQ+iJrLJj23S4GkOeecg8G091no737qvRRdzE+HLALQoMTBbJgBsCj5RSWUlUVJiZ4SOljb05eLFWgoJ5oY6yTyJp62D39jDANoKKcSocPJD5dQYzlFAFZJflUArgTPZKZwLXAnHmerfJquUkKZEgyzqOb5TuDt1P3nwxobqwPocZA11m4A1mBx5IxNgRH21ti7KbAGiyNn3HoF/gJ0w05A8xclpwAAAABJRU5ErkJggg==' /><h1>{v}</h1><h3>WiFiManager</h3>";
|
||||||
|
const char HTTP_ROOT_MAIN[] PROGMEM = "<h1>{t}</h1><h3>{v}</h3>";
|
||||||
|
|
||||||
|
const char * const HTTP_PORTAL_MENU[] PROGMEM = {
|
||||||
|
"<form action='/wifi' method='get'><button>Configurar WiFi</button></form><br/>\n", // MENU_WIFI
|
||||||
|
"<form action='/0wifi' method='get'><button>Configurar WiFi (sin escanear)</button></form><br/>\n", // MENU_WIFINOSCAN
|
||||||
|
"<form action='/info' method='get'><button>Información</button></form><br/>\n", // MENU_INFO
|
||||||
|
"<form action='/param' method='get'><button>Configuración</button></form><br/>\n",//MENU_PARAM
|
||||||
|
"<form action='/close' method='get'><button>Cerca</button></form><br/>\n", // MENU_CLOSE
|
||||||
|
"<form action='/restart' method='get'><button>Reanudar</button></form><br/>\n",// MENU_RESTART
|
||||||
|
"<form action='/exit' method='get'><button>Salida</button></form><br/>\n", // MENU_EXIT
|
||||||
|
"<form action='/erase' method='get'><button class='D'>Borrar</button></form><br/>\n", // MENU_ERASE
|
||||||
|
"<form action='/update' method='get'><button>Actualizer</button></form><br/>\n",// MENU_UPDATE
|
||||||
|
"<hr><br/>" // MENU_SEP
|
||||||
|
};
|
||||||
|
|
||||||
|
// const char HTTP_PORTAL_OPTIONS[] PROGMEM = strcat(HTTP_PORTAL_MENU[0] , HTTP_PORTAL_MENU[3] , HTTP_PORTAL_MENU[7]);
|
||||||
|
const char HTTP_PORTAL_OPTIONS[] PROGMEM = "";
|
||||||
|
const char HTTP_ITEM_QI[] PROGMEM = "<div role='img' aria-label='{r}%' title='{r}%' class='q q-{q} {i} {h}'></div>"; // rssi icons
|
||||||
|
const char HTTP_ITEM_QP[] PROGMEM = "<div class='q {h}'>{r}%</div>"; // rssi percentage {h} = hidden showperc pref
|
||||||
|
const char HTTP_ITEM[] PROGMEM = "<div><a href='#p' onclick='c(this)' data-ssid='{V}'>{v}</a>{qi}{qp}</div>"; // {q} = HTTP_ITEM_QI, {r} = HTTP_ITEM_QP
|
||||||
|
// const char HTTP_ITEM[] PROGMEM = "<div><a href='#p' onclick='c(this)'>{v}</a> {R} {r}% {q} {e}</div>"; // test all tokens
|
||||||
|
|
||||||
|
const char HTTP_FORM_START[] PROGMEM = "<form method='POST' action='{v}'>";
|
||||||
|
const char HTTP_FORM_WIFI[] PROGMEM = "<label for='s'>SSID</label><input id='s' name='s' maxlength='32' autocorrect='off' autocapitalize='none' placeholder='{v}'><br/><label for='p'>Contraseña</label><input id='p' name='p' maxlength='64' type='password' placeholder='{p}'><input type='checkbox' onclick='f()'> Mostrar contraseña";
|
||||||
|
const char HTTP_FORM_WIFI_END[] PROGMEM = "";
|
||||||
|
const char HTTP_FORM_STATIC_HEAD[] PROGMEM = "<hr><br/>";
|
||||||
|
const char HTTP_FORM_END[] PROGMEM = "<br/><br/><button type='submit'>Save</button></form>";
|
||||||
|
const char HTTP_FORM_LABEL[] PROGMEM = "<label for='{i}'>{t}</label>";
|
||||||
|
const char HTTP_FORM_PARAM_HEAD[] PROGMEM = "<hr><br/>";
|
||||||
|
const char HTTP_FORM_PARAM[] PROGMEM = "<br/><input id='{i}' name='{n}' maxlength='{l}' value='{v}' {c}>\n"; // do not remove newline!
|
||||||
|
|
||||||
|
const char HTTP_SCAN_LINK[] PROGMEM = "<br/><form action='/wifi?refresh=1' method='POST'><button name='refresh' value='1'>Refresh</button></form>";
|
||||||
|
const char HTTP_SAVED[] PROGMEM = "<div class='msg'>Saving Credentials<br/>Trying to connect ESP to network.<br />If it fails reconnect to AP to try again</div>";
|
||||||
|
const char HTTP_PARAMSAVED[] PROGMEM = "<div class='msg S'>Saved<br/></div>";
|
||||||
|
const char HTTP_END[] PROGMEM = "</div></body></html>";
|
||||||
|
const char HTTP_ERASEBTN[] PROGMEM = "<br/><form action='/erase' method='get'><button class='D'>Erase WiFi Config</button></form>";
|
||||||
|
const char HTTP_UPDATEBTN[] PROGMEM = "<br/><form action='/update' method='get'><button>Actualizer</button></form>";
|
||||||
|
const char HTTP_BACKBTN[] PROGMEM = "<hr><br/><form action='/' method='get'><button>Atrás</button></form>";
|
||||||
|
|
||||||
|
const char HTTP_STATUS_ON[] PROGMEM = "<div class='msg S'><strong>Conectado</strong> a {v}<br/><em><small>con IP {i}</small></em></div>";
|
||||||
|
const char HTTP_STATUS_OFF[] PROGMEM = "<div class='msg {c}'><strong>No conectado</strong> a {v}{r}</div>"; // {c=class} {v=ssid} {r=status_off}
|
||||||
|
const char HTTP_STATUS_OFFPW[] PROGMEM = "<br/>Authentication Failure"; // STATION_WRONG_PASSWORD, no eps32
|
||||||
|
const char HTTP_STATUS_OFFNOAP[] PROGMEM = "<br/>No Encontrado"; // WL_NO_SSID_AVAIL
|
||||||
|
const char HTTP_STATUS_OFFFAIL[] PROGMEM = "<br/>No se pudo conectar"; // WL_CONNECT_FAILED
|
||||||
|
const char HTTP_STATUS_NONE[] PROGMEM = "<div class='msg'>Sin AP establecido</div>";
|
||||||
|
const char HTTP_BR[] PROGMEM = "<br/>";
|
||||||
|
|
||||||
|
const char HTTP_STYLE[] PROGMEM = "<style>"
|
||||||
|
".c,body{text-align:center;font-family:verdana}div,input,select{padding:5px;font-size:1em;margin:5px 0;box-sizing:border-box}"
|
||||||
|
"input,button,select,.msg{border-radius:.3rem;width: 100%}input[type=radio],input[type=checkbox]{width:auto}"
|
||||||
|
"button,input[type='button'],input[type='submit']{cursor:pointer;border:0;background-color:#1fa3ec;color:#fff;line-height:2.4rem;font-size:1.2rem;width:100%}"
|
||||||
|
"input[type='file']{border:1px solid #1fa3ec}"
|
||||||
|
".wrap {text-align:left;display:inline-block;min-width:260px;max-width:500px}"
|
||||||
|
// links
|
||||||
|
"a{color:#000;font-weight:700;text-decoration:none}a:hover{color:#1fa3ec;text-decoration:underline}"
|
||||||
|
// quality icons
|
||||||
|
".q{height:16px;margin:0;padding:0 5px;text-align:right;min-width:38px;float:right}.q.q-0:after{background-position-x:0}.q.q-1:after{background-position-x:-16px}.q.q-2:after{background-position-x:-32px}.q.q-3:after{background-position-x:-48px}.q.q-4:after{background-position-x:-64px}.q.l:before{background-position-x:-80px;padding-right:5px}.ql .q{float:left}.q:after,.q:before{content:'';width:16px;height:16px;display:inline-block;background-repeat:no-repeat;background-position: 16px 0;"
|
||||||
|
"background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAAAQCAMAAADeZIrLAAAAJFBMVEX///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADHJj5lAAAAC3RSTlMAIjN3iJmqu8zd7vF8pzcAAABsSURBVHja7Y1BCsAwCASNSVo3/v+/BUEiXnIoXkoX5jAQMxTHzK9cVSnvDxwD8bFx8PhZ9q8FmghXBhqA1faxk92PsxvRc2CCCFdhQCbRkLoAQ3q/wWUBqG35ZxtVzW4Ed6LngPyBU2CobdIDQ5oPWI5nCUwAAAAASUVORK5CYII=');}"
|
||||||
|
// icons @2x media query (32px rescaled)
|
||||||
|
"@media (-webkit-min-device-pixel-ratio: 2),(min-resolution: 192dpi){.q:before,.q:after {"
|
||||||
|
"background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAALwAAAAgCAMAAACfM+KhAAAALVBMVEX///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAOrOgAAAADnRSTlMAESIzRGZ3iJmqu8zd7gKjCLQAAACmSURBVHgB7dDBCoMwEEXRmKlVY3L//3NLhyzqIqSUggy8uxnhCR5Mo8xLt+14aZ7wwgsvvPA/ofv9+44334UXXngvb6XsFhO/VoC2RsSv9J7x8BnYLW+AjT56ud/uePMdb7IP8Bsc/e7h8Cfk912ghsNXWPpDC4hvN+D1560A1QPORyh84VKLjjdvfPFm++i9EWq0348XXnjhhT+4dIbCW+WjZim9AKk4UZMnnCEuAAAAAElFTkSuQmCC');"
|
||||||
|
"background-size: 95px 16px;}}"
|
||||||
|
// msg callouts
|
||||||
|
".msg{padding:20px;margin:20px 0;border:1px solid #eee;border-left-width:5px;border-left-color:#777}.msg h4{margin-top:0;margin-bottom:5px}.msg.P{border-left-color:#1fa3ec}.msg.P h4{color:#1fa3ec}.msg.D{border-left-color:#dc3630}.msg.D h4{color:#dc3630}.msg.S{border-left-color: #5cb85c}.msg.S h4{color: #5cb85c}"
|
||||||
|
// lists
|
||||||
|
"dt{font-weight:bold}dd{margin:0;padding:0 0 0.5em 0;min-height:12px}"
|
||||||
|
"td{vertical-align: top;}"
|
||||||
|
".h{display:none}"
|
||||||
|
"button{transition: 0s opacity;transition-delay: 3s;transition-duration: 0s;cursor: pointer}"
|
||||||
|
"button.D{background-color:#dc3630}"
|
||||||
|
"button:active{opacity:50% !important;cursor:wait;transition-delay: 0s}"
|
||||||
|
// invert
|
||||||
|
"body.invert,body.invert a,body.invert h1 {background-color:#060606;color:#fff;}"
|
||||||
|
"body.invert .msg{color:#fff;background-color:#282828;border-top:1px solid #555;border-right:1px solid #555;border-bottom:1px solid #555;}"
|
||||||
|
"body.invert .q[role=img]{-webkit-filter:invert(1);filter:invert(1);}"
|
||||||
|
":disabled {opacity: 0.5;}"
|
||||||
|
"</style>";
|
||||||
|
|
||||||
|
#ifndef WM_NOHELP
|
||||||
|
const char HTTP_HELP[] PROGMEM =
|
||||||
|
"<br/><h3>Available Pages</h3><hr>"
|
||||||
|
"<table class='table'>"
|
||||||
|
"<thead><tr><th>Page</th><th>Function</th></tr></thead><tbody>"
|
||||||
|
"<tr><td><a href='/'>/</a></td>"
|
||||||
|
"<td>Menu page.</td></tr>"
|
||||||
|
"<tr><td><a href='/wifi'>/wifi</a></td>"
|
||||||
|
"<td>Show WiFi scan results and enter WiFi configuration.(/0wifi noscan)</td></tr>"
|
||||||
|
"<tr><td><a href='/wifisave'>/wifisave</a></td>"
|
||||||
|
"<td>Save WiFi configuration information and configure device. Needs variables supplied.</td></tr>"
|
||||||
|
"<tr><td><a href='/param'>/param</a></td>"
|
||||||
|
"<td>Parameter page</td></tr>"
|
||||||
|
"<tr><td><a href='/info'>/info</a></td>"
|
||||||
|
"<td>Information page</td></tr>"
|
||||||
|
"<tr><td><a href='/u'>/u</a></td>"
|
||||||
|
"<td>OTA Update</td></tr>"
|
||||||
|
"<tr><td><a href='/close'>/close</a></td>"
|
||||||
|
"<td>Close the captiveportal popup,configportal will remain active</td></tr>"
|
||||||
|
"<tr><td>/exit</td>"
|
||||||
|
"<td>Exit Config Portal, configportal will close</td></tr>"
|
||||||
|
"<tr><td>/restart</td>"
|
||||||
|
"<td>Reboot the device</td></tr>"
|
||||||
|
"<tr><td>/erase</td>"
|
||||||
|
"<td>Erase WiFi configuration and reboot Device. Device will not reconnect to a network until new WiFi configuration data is entered.</td></tr>"
|
||||||
|
"</table>"
|
||||||
|
"<p/>Github <a href='https://github.com/tzapu/WiFiManager'>https://github.com/tzapu/WiFiManager</a>.";
|
||||||
|
#else
|
||||||
|
const char HTTP_HELP[] PROGMEM = "";
|
||||||
|
#endif
|
||||||
|
|
||||||
|
const char HTTP_UPDATE[] PROGMEM = "Upload New Firmware<br/><form method='POST' action='u' enctype='multipart/form-data' onchange=\"(function(el){document.getElementById('uploadbin').style.display = el.value=='' ? 'none' : 'initial';})(this)\"><input type='file' name='update' accept='.bin,application/octet-stream'><button id='uploadbin' type='submit' class='h D'>Update</button></form><small><a href='http://192.168.4.1/update' target='_blank'>* May not function inside captive portal, Open in browser http://192.168.4.1</a><small>";
|
||||||
|
const char HTTP_UPDATE_FAIL[] PROGMEM = "<div class='msg D'><strong>Update Failed!</strong><Br/>Reboot device and try again</div>";
|
||||||
|
const char HTTP_UPDATE_SUCCESS[] PROGMEM = "<div class='msg S'><strong>Update Successful. </strong> <br/> Device Rebooting now...</div>";
|
||||||
|
|
||||||
|
#ifdef WM_JSTEST
|
||||||
|
const char HTTP_JS[] PROGMEM =
|
||||||
|
"<script>function postAjax(url, data, success) {"
|
||||||
|
" var params = typeof data == 'string' ? data : Object.keys(data).map("
|
||||||
|
" function(k){ return encodeURIComponent(k) + '=' + encodeURIComponent(data[k]) }"
|
||||||
|
" ).join('&');"
|
||||||
|
" var xhr = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject(\"Microsoft.XMLHTTP\");"
|
||||||
|
" xhr.open('POST', url);"
|
||||||
|
" xhr.onreadystatechange = function() {"
|
||||||
|
" if (xhr.readyState>3 && xhr.status==200) { success(xhr.responseText); }"
|
||||||
|
" };"
|
||||||
|
" xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');"
|
||||||
|
" xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');"
|
||||||
|
" xhr.send(params);"
|
||||||
|
" return xhr;}"
|
||||||
|
"postAjax('/status', 'p1=1&p2=Hello+World', function(data){ console.log(data); });"
|
||||||
|
"postAjax('/status', { p1: 1, p2: 'Hello World' }, function(data){ console.log(data); });"
|
||||||
|
"</script>";
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Info html
|
||||||
|
// @todo remove html elements from progmem, repetetive strings
|
||||||
|
#ifdef ESP32
|
||||||
|
const char HTTP_INFO_esphead[] PROGMEM = "<h3>esp32</h3><hr><dl>";
|
||||||
|
const char HTTP_INFO_chiprev[] PROGMEM = "<dt>Chip Rev</dt><dd>{1}</dd>";
|
||||||
|
const char HTTP_INFO_lastreset[] PROGMEM = "<dt>Last reset reason</dt><dd>CPU0: {1}<br/>CPU1: {2}</dd>";
|
||||||
|
const char HTTP_INFO_aphost[] PROGMEM = "<dt>Access Point Hostname</dt><dd>{1}</dd>";
|
||||||
|
const char HTTP_INFO_psrsize[] PROGMEM = "<dt>PSRAM Size</dt><dd>{1} bytes</dd>";
|
||||||
|
const char HTTP_INFO_temp[] PROGMEM = "<dt>Temperature</dt><dd>{1} C° / {2} F°</dd><dt>Hall</dt><dd>{3}</dd>";
|
||||||
|
#else
|
||||||
|
const char HTTP_INFO_esphead[] PROGMEM = "<h3>esp8266</h3><hr><dl>";
|
||||||
|
const char HTTP_INFO_fchipid[] PROGMEM = "<dt>Flash Chip ID</dt><dd>{1}</dd>";
|
||||||
|
const char HTTP_INFO_corever[] PROGMEM = "<dt>Core Version</dt><dd>{1}</dd>";
|
||||||
|
const char HTTP_INFO_bootver[] PROGMEM = "<dt>Boot Version</dt><dd>{1}</dd>";
|
||||||
|
const char HTTP_INFO_lastreset[] PROGMEM = "<dt>Last reset reason</dt><dd>{1}</dd>";
|
||||||
|
const char HTTP_INFO_flashsize[] PROGMEM = "<dt>Real Flash Size</dt><dd>{1} bytes</dd>";
|
||||||
|
#endif
|
||||||
|
|
||||||
|
const char HTTP_INFO_memsmeter[] PROGMEM = "<br/><progress value='{1}' max='{2}'></progress></dd>";
|
||||||
|
const char HTTP_INFO_memsketch[] PROGMEM = "<dt>Memory - Sketch Size</dt><dd>Used / Total bytes<br/>{1} / {2}";
|
||||||
|
const char HTTP_INFO_freeheap[] PROGMEM = "<dt>Memory - Free Heap</dt><dd>{1} bytes available</dd>";
|
||||||
|
const char HTTP_INFO_wifihead[] PROGMEM = "<br/><h3>WiFi</h3><hr>";
|
||||||
|
const char HTTP_INFO_uptime[] PROGMEM = "<dt>Uptime</dt><dd>{1} Mins {2} Secs</dd>";
|
||||||
|
const char HTTP_INFO_chipid[] PROGMEM = "<dt>Chip ID</dt><dd>{1}</dd>";
|
||||||
|
const char HTTP_INFO_idesize[] PROGMEM = "<dt>Flash Size</dt><dd>{1} bytes</dd>";
|
||||||
|
const char HTTP_INFO_sdkver[] PROGMEM = "<dt>SDK Version</dt><dd>{1}</dd>";
|
||||||
|
const char HTTP_INFO_cpufreq[] PROGMEM = "<dt>CPU Frequency</dt><dd>{1}MHz</dd>";
|
||||||
|
const char HTTP_INFO_apip[] PROGMEM = "<dt>Access Point IP</dt><dd>{1}</dd>";
|
||||||
|
const char HTTP_INFO_apmac[] PROGMEM = "<dt>Access Point MAC</dt><dd>{1}</dd>";
|
||||||
|
const char HTTP_INFO_apssid[] PROGMEM = "<dt>Access Point SSID</dt><dd>{1}</dd>";
|
||||||
|
const char HTTP_INFO_apbssid[] PROGMEM = "<dt>BSSID</dt><dd>{1}</dd>";
|
||||||
|
const char HTTP_INFO_stassid[] PROGMEM = "<dt>Station SSID</dt><dd>{1}</dd>";
|
||||||
|
const char HTTP_INFO_staip[] PROGMEM = "<dt>Station IP</dt><dd>{1}</dd>";
|
||||||
|
const char HTTP_INFO_stagw[] PROGMEM = "<dt>Station Gateway</dt><dd>{1}</dd>";
|
||||||
|
const char HTTP_INFO_stasub[] PROGMEM = "<dt>Station Subnet</dt><dd>{1}</dd>";
|
||||||
|
const char HTTP_INFO_dnss[] PROGMEM = "<dt>DNS Server</dt><dd>{1}</dd>";
|
||||||
|
const char HTTP_INFO_host[] PROGMEM = "<dt>Hostname</dt><dd>{1}</dd>";
|
||||||
|
const char HTTP_INFO_stamac[] PROGMEM = "<dt>Station MAC</dt><dd>{1}</dd>";
|
||||||
|
const char HTTP_INFO_conx[] PROGMEM = "<dt>Connected</dt><dd>{1}</dd>";
|
||||||
|
const char HTTP_INFO_autoconx[] PROGMEM = "<dt>Autoconnect</dt><dd>{1}</dd>";
|
||||||
|
|
||||||
|
const char HTTP_INFO_aboutver[] PROGMEM = "<dt>WiFiManager</dt><dd>{1}</dd>";
|
||||||
|
const char HTTP_INFO_aboutarduino[] PROGMEM = "<dt>Arduino</dt><dd>{1}</dd>";
|
||||||
|
const char HTTP_INFO_aboutsdk[] PROGMEM = "<dt>ESP-SDK/IDF</dt><dd>{1}</dd>";
|
||||||
|
const char HTTP_INFO_aboutdate[] PROGMEM = "<dt>Build Date</dt><dd>{1}</dd>";
|
||||||
|
|
||||||
|
const char S_brand[] PROGMEM = "WiFiManager";
|
||||||
|
const char S_debugPrefix[] PROGMEM = "*wm:";
|
||||||
|
const char S_y[] PROGMEM = "Yes";
|
||||||
|
const char S_n[] PROGMEM = "No";
|
||||||
|
const char S_enable[] PROGMEM = "Enabled";
|
||||||
|
const char S_disable[] PROGMEM = "Disabled";
|
||||||
|
const char S_GET[] PROGMEM = "GET";
|
||||||
|
const char S_POST[] PROGMEM = "POST";
|
||||||
|
const char S_NA[] PROGMEM = "Unknown";
|
||||||
|
const char S_passph[] PROGMEM = "********";
|
||||||
|
const char S_titlewifisaved[] PROGMEM = "Credentials Saved";
|
||||||
|
const char S_titlewifisettings[] PROGMEM = "Settings Saved";
|
||||||
|
const char S_titlewifi[] PROGMEM = "Config ESP";
|
||||||
|
const char S_titleinfo[] PROGMEM = "Info";
|
||||||
|
const char S_titleparam[] PROGMEM = "Setup";
|
||||||
|
const char S_titleparamsaved[] PROGMEM = "Setup Saved";
|
||||||
|
const char S_titleexit[] PROGMEM = "Exit";
|
||||||
|
const char S_titlereset[] PROGMEM = "Reset";
|
||||||
|
const char S_titleerase[] PROGMEM = "Erase";
|
||||||
|
const char S_titleclose[] PROGMEM = "Close";
|
||||||
|
const char S_options[] PROGMEM = "options";
|
||||||
|
const char S_nonetworks[] PROGMEM = "No networks found. Refresh to scan again.";
|
||||||
|
const char S_staticip[] PROGMEM = "Static IP";
|
||||||
|
const char S_staticgw[] PROGMEM = "Static Gateway";
|
||||||
|
const char S_staticdns[] PROGMEM = "Static DNS";
|
||||||
|
const char S_subnet[] PROGMEM = "Subnet";
|
||||||
|
const char S_exiting[] PROGMEM = "Exiting";
|
||||||
|
const char S_resetting[] PROGMEM = "Module will reset in a few seconds.";
|
||||||
|
const char S_closing[] PROGMEM = "You can close the page, portal will continue to run";
|
||||||
|
const char S_error[] PROGMEM = "An Error Occured";
|
||||||
|
const char S_notfound[] PROGMEM = "File Not Found\n\n";
|
||||||
|
const char S_uri[] PROGMEM = "URI: ";
|
||||||
|
const char S_method[] PROGMEM = "\nMethod: ";
|
||||||
|
const char S_args[] PROGMEM = "\nArguments: ";
|
||||||
|
const char S_parampre[] PROGMEM = "param_";
|
||||||
|
|
||||||
|
// debug strings
|
||||||
|
const char D_HR[] PROGMEM = "--------------------";
|
||||||
|
|
||||||
|
|
||||||
|
// softap ssid default prefix
|
||||||
|
#ifdef ESP8266
|
||||||
|
const char S_ssidpre[] PROGMEM = "ESP";
|
||||||
|
#elif defined(ESP32)
|
||||||
|
const char S_ssidpre[] PROGMEM = "ESP32";
|
||||||
|
#else
|
||||||
|
const char S_ssidpre[] PROGMEM = "WM";
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// END WIFI_MANAGER_OVERRIDE_STRINGS
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
Reference in New Issue
Block a user