diff --git a/lib/WiFiManager/include/WiFiManager.h b/lib/WiFiManager/include/WiFiManager.h index c86c15b..63c3fc8 100644 --- a/lib/WiFiManager/include/WiFiManager.h +++ b/lib/WiFiManager/include/WiFiManager.h @@ -129,16 +129,15 @@ #include -// Include wm strings vars -// Pass in strings env override via WM_STRINGS_FILE -#ifndef WM_STRINGS_FILE -#define WM_STRINGS_FILE "wm_strings_en.h" // this includes constants as dependency -#endif -#include WM_STRINGS_FILE +// Include utility functions +#include "WiFiManagerUtils.h" // prep string concat vars #define WM_STRING2(x) #x -#define WM_STRING(x) WM_STRING2(x) +#define WM_STRING(x) WM_STRING2(x) + +// WiFiManager version +const char WM_VERSION_STR[] PROGMEM = "v2.0.18"; // #include #ifdef ESP_IDF_VERSION @@ -441,6 +440,9 @@ class WiFiManager // get default ap esp uses , esp_chipid etc String getDefaultAPName(); + // set the WiFi SSID prefix for default AP name, default platform-specific (ESP/ESP32/WM) + void setWiFiSSIDPrefix(String prefix); + // set port of webserver, 80 void setHttpPort(uint16_t port); @@ -584,7 +586,15 @@ class WiFiManager unsigned long _saveTimeout = 0; // ms stop trying to connect to ap on saves, in case bugs in esp waitforconnectresult WiFiMode_t _usermode = WIFI_STA; // Default user mode - String _wifissidprefix = FPSTR(S_ssidpre); // auto apname prefix prefix+chipid + String _wifissidprefix = +#ifdef ESP8266 + "ESP" +#elif defined(ESP32) + "ESP32" +#else + "WM" +#endif + ; // auto apname prefix prefix+chipid int _cpclosedelay = 2000; // delay before wifisave, prevents captive portal from closing to fast. bool _cleanConnect = false; // disconnect before connect in connectwifi, increases stability on connects bool _connectonsave = true; // connect to wifi when saving creds @@ -636,7 +646,7 @@ class WiFiManager const char* _customBodyFooter = ""; // store custom bottom body element html from user inside const char* _customMenuHTML = ""; // store custom menu html from user String _bodyClass = ""; // class to add to body - String _title = FPSTR(S_brand); // app title - default WiFiManager + String _title = "WiFiManager"; // app title - default WiFiManager // internal options @@ -782,7 +792,7 @@ protected: WiFiManagerParameter** _params = NULL; boolean _debug = true; - String _debugPrefix = FPSTR(S_debugPrefix); + String _debugPrefix = "*wm:"; // default debug prefix wm_debuglevel_t debugLvlShow = WM_DEBUG_VERBOSE; // at which level start showing [n] level tags diff --git a/lib/WiFiManager/include/WiFiManagerHandlers.h b/lib/WiFiManager/include/WiFiManagerHandlers.h index a797364..e955c61 100644 --- a/lib/WiFiManager/include/WiFiManagerHandlers.h +++ b/lib/WiFiManager/include/WiFiManagerHandlers.h @@ -18,6 +18,35 @@ #include #include "WiFiManager.h" // Need full definition for WiFiManagerRequestArgs +// ----------------------------------------------------------------------------------------------- +// CSS CLASSES (for body class attribute) + +const char C_root[] PROGMEM = "home"; +const char C_wifi[] PROGMEM = "wifi"; +const char C_info[] PROGMEM = "info"; +const char C_param[] PROGMEM = "param"; +const char C_close[] PROGMEM = "close"; +const char C_restart[] PROGMEM = "restart"; +const char C_exit[] PROGMEM = "exit"; +const char C_erase[] PROGMEM = "erase"; +const char C_update[] PROGMEM = "update"; + +// ----------------------------------------------------------------------------------------------- +// FORM FIELD NAMES (for IP configuration forms) + +const char S_ip[] PROGMEM = "ip"; +const char S_gw[] PROGMEM = "gw"; +const char S_sn[] PROGMEM = "sn"; +const char S_dns[] PROGMEM = "dns"; + +// ----------------------------------------------------------------------------------------------- +// HTTP HEADERS + +const char HTTP_HEAD_CT[] PROGMEM = "text/html"; +const char HTTP_HEAD_CT2[] PROGMEM = "text/plain"; +const char HTTP_HEAD_CORS[] PROGMEM = "Access-Control-Allow-Origin"; +const char HTTP_HEAD_CORS_ALLOW_ALL[] PROGMEM = "*"; + class WiFiManagerHandlers { public: WiFiManagerHandlers(WiFiManager* wm); diff --git a/lib/WiFiManager/include/WiFiManagerParameter.h b/lib/WiFiManager/include/WiFiManagerParameter.h index 82d63f0..ba6fcbd 100644 --- a/lib/WiFiManager/include/WiFiManagerParameter.h +++ b/lib/WiFiManager/include/WiFiManagerParameter.h @@ -26,7 +26,7 @@ class WiFiManagerParameter { WiFiManagerParameter(const char *id, const char *label, const char *defaultValue, int length); WiFiManagerParameter(const char *id, const char *label, const char *defaultValue, int length, const char *custom); WiFiManagerParameter(const char *id, const char *label, const char *defaultValue, int length, const char *custom, int labelPlacement); - ~WiFiManagerParameter(); + virtual ~WiFiManagerParameter(); // WiFiManagerParameter& operator=(const WiFiManagerParameter& rhs); const char *getID() const; diff --git a/lib/WiFiManager/include/WiFiManagerServer.h b/lib/WiFiManager/include/WiFiManagerServer.h index 22d30e0..498b4ed 100644 --- a/lib/WiFiManager/include/WiFiManagerServer.h +++ b/lib/WiFiManager/include/WiFiManagerServer.h @@ -25,6 +25,42 @@ class WiFiManager; // Forward declaration - full definition needed in .cpp file class WiFiManagerHandlers; +// ----------------------------------------------------------------------------------------------- +// MENU TOKENS (for menu configuration via setMenu) + +extern const char _wifi_token[] PROGMEM; +extern const char _wifinoscan_token[] PROGMEM; +extern const char _info_token[] PROGMEM; +extern const char _param_token[] PROGMEM; +extern const char _close_token[] PROGMEM; +extern const char _restart_token[] PROGMEM; +extern const char _exit_token[] PROGMEM; +extern const char _erase_token[] PROGMEM; +extern const char _update_token[] PROGMEM; +extern const char _sep_token[] PROGMEM; +extern const char _custom_token[] PROGMEM; +extern PGM_P _menutokens[] PROGMEM; +extern const uint8_t _nummenutokens; + +// ----------------------------------------------------------------------------------------------- +// HTTP ROUTES + +const char R_root[] PROGMEM = "/"; +const char R_wifi[] PROGMEM = "/wifi"; +const char R_wifinoscan[] PROGMEM = "/0wifi"; +const char R_wifisave[] PROGMEM = "/wifisave"; +const char R_info[] PROGMEM = "/info"; +const char R_param[] PROGMEM = "/param"; +const char R_paramsave[] PROGMEM = "/paramsave"; +const char R_restart[] PROGMEM = "/restart"; +const char R_exit[] PROGMEM = "/exit"; +const char R_close[] PROGMEM = "/close"; +const char R_erase[] PROGMEM = "/erase"; +const char R_status[] PROGMEM = "/status"; +const char R_scanstatus[] PROGMEM = "/wifistatus"; +const char R_update[] PROGMEM = "/update"; +const char R_updatedone[] PROGMEM = "/u"; + class WiFiManagerServer { public: WiFiManagerServer(WiFiManager* wm); diff --git a/lib/WiFiManager/include/WiFiManagerUtils.h b/lib/WiFiManager/include/WiFiManagerUtils.h new file mode 100644 index 0000000..cae5383 --- /dev/null +++ b/lib/WiFiManager/include/WiFiManagerUtils.h @@ -0,0 +1,106 @@ +/** + * WiFiManagerUtils.h + * Pure utility functions for WiFiManager + * String conversions, HTML encoding, and helper calculations + * These functions have no dependency on WiFiManager instance state + * + * @author Alex Hope-O'Connor + * @license MIT + */ + +#ifndef _WIFI_MANAGER_UTILS_H_ +#define _WIFI_MANAGER_UTILS_H_ + +#include + +// Forward declaration +class IPAddress; + +namespace WiFiManagerUtils { + +// ----------------------------------------------------------------------------------------------- +// WIFI STATUS ARRAYS (for status string conversion) + +extern const char * const WIFI_STA_STATUS[] PROGMEM; +extern const char * const WIFI_MODES[] PROGMEM; + +#ifdef ESP32 +extern const char * const AUTH_MODE_NAMES[] PROGMEM; +#elif defined(ESP8266) +extern const char * const AUTH_MODE_NAMES[] PROGMEM; +#endif + +// ----------------------------------------------------------------------------------------------- +// STRING CONVERSION UTILITIES + +/** + * Convert WiFi status code to readable string + * @param status WiFi status code + * @return Status string or "Unknown" if invalid + */ +String getStatusString(uint8_t status); + + +/** + * Convert WiFi mode code to readable string + * @param mode WiFi mode code + * @return Mode string or "Unknown" if invalid + */ +String getModeString(uint8_t mode); + +/** + * Convert encryption/auth mode to readable string + * @param authmode Encryption type code + * @return Encryption type string + */ +String getEncryptionString(uint8_t authmode); + +// ----------------------------------------------------------------------------------------------- +// HTML UTILITIES + +/** + * Encode HTML entities in a string + * @param str String to encode + * @param whitespace If true, also encode spaces as   + * @return Encoded string + */ +String htmlEntities(const String& str, bool whitespace = false); + +// ----------------------------------------------------------------------------------------------- +// IP/STRING UTILITIES + +/** + * Check if string is a valid IP address + * @param str String to check + * @return true if valid IP address + */ +bool isValidIP(const String& str); + +/** + * Convert IPAddress to String + * @param ip IPAddress to convert + * @return IP address string + */ +String ipToString(IPAddress ip); + +/** + * Validate AP password format (8-63 characters) + * @param password Password to validate + * @return true if valid + */ +bool isValidAPPassword(const String& password); + +// ----------------------------------------------------------------------------------------------- +// HELPER CALCULATIONS + +/** + * Convert RSSI value to quality percentage (0-100) + * @param rssi RSSI value in dBm + * @return Quality percentage (0-100) + */ +int rssiToQuality(int rssi); + +} // namespace WiFiManagerUtils + +#endif // _WIFI_MANAGER_UTILS_H_ + diff --git a/lib/WiFiManager/include/strings_en.h b/lib/WiFiManager/include/strings_en.h deleted file mode 100644 index cabeb58..0000000 --- a/lib/WiFiManager/include/strings_en.h +++ /dev/null @@ -1,15 +0,0 @@ -/** - * Contents of this file have moved to 2 new locations - * wm_strings_nn.h - * wm_consts_nn.h - */ - -#warning "This file is deprecated" - -#ifndef _STRINGS_EN_H_ -#define _STRINGS_EN_H_ - -// strings files must include a consts file! -#include "wm_strings_en.h" // include constants, tokens, routes - -#endif \ No newline at end of file diff --git a/lib/WiFiManager/include/templates/CSS.h b/lib/WiFiManager/include/templates/CSS.h new file mode 100644 index 0000000..9fdd365 --- /dev/null +++ b/lib/WiFiManager/include/templates/CSS.h @@ -0,0 +1,45 @@ +/** + * CSS.h + * CSS stylesheet for WiFiManager web interface + * Embedded styles to avoid external file dependencies + */ + +#ifndef _CSS_TEMPLATES_H_ +#define _CSS_TEMPLATES_H_ + +#include + +const char CSS_STYLE[] PROGMEM = ""; + +#endif // _CSS_TEMPLATES_H_ + diff --git a/lib/WiFiManager/include/templates/HTML.h b/lib/WiFiManager/include/templates/HTML.h new file mode 100644 index 0000000..53f4ef0 --- /dev/null +++ b/lib/WiFiManager/include/templates/HTML.h @@ -0,0 +1,134 @@ +/** + * HTML.h + * HTML template fragments for WiFiManager web interface + * Static PROGMEM strings to reduce string concatenations + */ + +#ifndef _HTML_TEMPLATES_H_ +#define _HTML_TEMPLATES_H_ + +#include + +// HTML document structure +const char HTML_HEAD_START[] PROGMEM = +"" +"" +"" +"" +"" +""; + +const char HTML_TITLE_END[] PROGMEM = ""; + +const char HTML_HEAD_END_START[] PROGMEM = "
"; + +const char HTML_END[] PROGMEM = "
"; + +// Form elements +const char HTML_FORM_END[] PROGMEM = "

"; + +const char HTML_FORM_STATIC_HEAD[] PROGMEM = "

"; + +const char HTML_FORM_PARAM_HEAD[] PROGMEM = "

"; + +const char HTML_FORM_WIFI_END[] PROGMEM = ""; + +const char HTML_BR[] PROGMEM = "
"; + +// Buttons +const char HTML_BACKBTN[] PROGMEM = "

"; + +const char HTML_ERASEBTN[] PROGMEM = "
"; + +// Status messages +const char HTML_STATUS_OFFPW[] PROGMEM = "
Authentication failure"; + +const char HTML_STATUS_OFFNOAP[] PROGMEM = "
AP not found"; + +const char HTML_STATUS_OFFFAIL[] PROGMEM = "
Could not connect"; + +const char HTML_STATUS_NONE[] PROGMEM = "
No AP set
"; + +const char HTML_SAVED[] PROGMEM = "
Saving Credentials
Trying to connect ESP to network.
If it fails reconnect to AP to try again
"; + +const char HTML_PARAMSAVED[] PROGMEM = "
Saved
"; + +// Update page +const char HTML_UPDATE[] PROGMEM = "Upload new firmware
* May not function inside captive portal, open in browser http://192.168.4.1"; + +const char HTML_UPDATE_FAIL[] PROGMEM = "
Update failed!
Reboot device and try again
"; + +const char HTML_UPDATE_SUCCESS[] PROGMEM = "
Update successful.
Device rebooting now...
"; + +// Portal menu +const char * const HTML_PORTAL_MENU[] PROGMEM = { +"

\n", // MENU_WIFI +"

\n", // MENU_WIFINOSCAN +"

\n", // MENU_INFO +"

\n",//MENU_PARAM +"

\n", // MENU_CLOSE +"

\n",// MENU_RESTART +"

\n", // MENU_EXIT +"

\n", // MENU_ERASE +"

\n",// MENU_UPDATE +"

" // MENU_SEP +}; + +const char HTML_PORTAL_OPTIONS[] PROGMEM = ""; + +// Help page +#ifndef WM_NOHELP +const char HTML_HELP[] PROGMEM = + "

Available pages

" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "
PageFunction
/Menu page.
/wifiShow WiFi scan results and enter WiFi configuration.(/0wifi noscan)
/wifisaveSave WiFi configuration information and configure device. Needs variables supplied.
/paramParameter page
/infoInformation page
/uOTA Update
/closeClose the captiveportal popup, config portal will remain active
/exitExit Config portal, config portal will close
/restartReboot the device
/eraseErase WiFi configuration and reboot device. Device will not reconnect to a network until new WiFi configuration data is entered.
" + "

Github https://github.com/tzapu/WiFiManager."; +#else +const char HTML_HELP[] PROGMEM = ""; +#endif + +#ifdef WM_JSTEST +const char HTML_JS[] PROGMEM = +""; +#endif + +#endif // _HTML_TEMPLATES_H_ + diff --git a/lib/WiFiManager/include/templates/JS.h b/lib/WiFiManager/include/templates/JS.h new file mode 100644 index 0000000..936e3dc --- /dev/null +++ b/lib/WiFiManager/include/templates/JS.h @@ -0,0 +1,24 @@ +/** + * JS.h + * JavaScript code for WiFiManager web interface + * Client-side functionality for WiFi configuration + */ + +#ifndef _JS_TEMPLATES_H_ +#define _JS_TEMPLATES_H_ + +#include + +const char JS_SCRIPT[] PROGMEM = ""; // @todo add button states, disable on click , show ack , spinner etc + +#endif // _JS_TEMPLATES_H_ + diff --git a/lib/WiFiManager/include/wm_consts_en.h b/lib/WiFiManager/include/wm_consts_en.h deleted file mode 100644 index 109f324..0000000 --- a/lib/WiFiManager/include/wm_consts_en.h +++ /dev/null @@ -1,279 +0,0 @@ -/** - * wm_consts.h - * internal const strings/tokens - * WiFiManager, a library for the ESP8266/Arduino platform - * for configuration of WiFi credentials using a Captive Portal - * - * @author Creator tzapu - * @author tablatronix - * @author Alex Hope-O'Connor - * @license MIT - */ - -#ifndef _WM_CONSTS_H -#define _WM_CONSTS_H - - -// ----------------------------------------------------------------------------------------------- -// TOKENS - -const char WM_VERSION_STR[] PROGMEM = "v2.0.17"; - -static const char _wifi_token[] PROGMEM = "wifi"; -static const char _wifinoscan_token[] PROGMEM = "wifinoscan"; -static const char _info_token[] PROGMEM = "info"; -static const char _param_token[] PROGMEM = "param"; -static const char _close_token[] PROGMEM = "close"; -static const char _restart_token[] PROGMEM = "restart"; -static const char _exit_token[] PROGMEM = "exit"; -static const char _erase_token[] PROGMEM = "erase"; -static const char _update_token[] PROGMEM = "update"; -static const char _sep_token[] PROGMEM = "sep"; -static const char _custom_token[] PROGMEM = "custom"; -static PGM_P _menutokens[] PROGMEM = { - _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)); - - -// Routes -const char R_root[] PROGMEM = "/"; -const char R_wifi[] PROGMEM = "/wifi"; -const char R_wifinoscan[] PROGMEM = "/0wifi"; -const char R_wifisave[] PROGMEM = "/wifisave"; -const char R_info[] PROGMEM = "/info"; -const char R_param[] PROGMEM = "/param"; -const char R_paramsave[] PROGMEM = "/paramsave"; -const char R_restart[] PROGMEM = "/restart"; -const char R_exit[] PROGMEM = "/exit"; -const char R_close[] PROGMEM = "/close"; -const char R_erase[] PROGMEM = "/erase"; -const char R_status[] PROGMEM = "/status"; -const char R_scanstatus[] PROGMEM = "/wifistatus"; -const char R_update[] PROGMEM = "/update"; -const char R_updatedone[] PROGMEM = "/u"; - - -// Classes -const char C_root[] PROGMEM = "home"; -const char C_wifi[] PROGMEM = "wifi"; -const char C_info[] PROGMEM = "info"; -const char C_param[] PROGMEM = "param"; -const char C_close[] PROGMEM = "close"; -const char C_restart[] PROGMEM = "restart"; -const char C_exit[] PROGMEM = "exit"; -const char C_erase[] PROGMEM = "erase"; -const char C_update[] PROGMEM = "update"; - - -//Strings -const char S_ip[] PROGMEM = "ip"; -const char S_gw[] PROGMEM = "gw"; -const char S_sn[] PROGMEM = "sn"; -const char S_dns[] PROGMEM = "dns"; - - - -//Tokens -//@todo consolidate and reduce -const char T_ss[] PROGMEM = "{"; // token start sentinel -const char T_es[] PROGMEM = "}"; // token end sentinel -const char T_1[] PROGMEM = "{1}"; // @token 1 -const char T_2[] PROGMEM = "{2}"; // @token 2 -const char T_3[] PROGMEM = "{3}"; // @token 2 -const char T_v[] PROGMEM = "{v}"; // @token v -const char T_V[] PROGMEM = "{V}"; // @token v -const char T_I[] PROGMEM = "{I}"; // @token I -const char T_i[] PROGMEM = "{i}"; // @token i -const char T_n[] PROGMEM = "{n}"; // @token n -const char T_p[] PROGMEM = "{p}"; // @token p -const char T_t[] PROGMEM = "{t}"; // @token t -const char T_l[] PROGMEM = "{l}"; // @token l -const char T_c[] PROGMEM = "{c}"; // @token c -const char T_e[] PROGMEM = "{e}"; // @token e -const char T_q[] PROGMEM = "{q}"; // @token q -const char T_r[] PROGMEM = "{r}"; // @token r -const char T_R[] PROGMEM = "{R}"; // @token R -const char T_h[] PROGMEM = "{h}"; // @token h - -// http -const char HTTP_HEAD_CL[] PROGMEM = "Content-Length"; -const char HTTP_HEAD_CT[] PROGMEM = "text/html"; -const char HTTP_HEAD_CT2[] PROGMEM = "text/plain"; -const char HTTP_HEAD_CORS[] PROGMEM = "Access-Control-Allow-Origin"; -const char HTTP_HEAD_CORS_ALLOW_ALL[] PROGMEM = "*"; - -const char * const WIFI_STA_STATUS[] PROGMEM -{ - "WL_IDLE_STATUS", // 0 STATION_IDLE - "WL_NO_SSID_AVAIL", // 1 STATION_NO_AP_FOUND - "WL_SCAN_COMPLETED", // 2 - "WL_CONNECTED", // 3 STATION_GOT_IP - "WL_CONNECT_FAILED", // 4 STATION_CONNECT_FAIL, STATION_WRONG_PASSWORD(NI) - "WL_CONNECTION_LOST", // 5 - "WL_DISCONNECTED", // 6 - "WL_STATION_WRONG_PASSWORD" // 7 KLUDGE -}; - -#ifdef ESP32 -const char * const AUTH_MODE_NAMES[] PROGMEM -{ - "OPEN", - "WEP", - "WPA_PSK", - "WPA2_PSK", - "WPA_WPA2_PSK", - "WPA2_ENTERPRISE", - "MAX" -}; -#elif defined(ESP8266) -const char * const AUTH_MODE_NAMES[] PROGMEM -{ - "", - "", - "WPA_PSK", // 2 ENC_TYPE_TKIP - "", - "WPA2_PSK", // 4 ENC_TYPE_CCMP - "WEP", // 5 ENC_TYPE_WEP - "", - "OPEN", //7 ENC_TYPE_NONE - "WPA_WPA2_PSK", // 8 ENC_TYPE_AUTO -}; -#endif - -const char* const WIFI_MODES[] PROGMEM = { "NULL", "STA", "AP", "STA+AP" }; - - -#ifdef ESP32 -// as 2.5.2 -// typedef struct { -// char cc[3]; /**< country code string */ -// uint8_t schan; /**< start channel */ -// uint8_t nchan; /**< total channel number */ -// int8_t max_tx_power; /**< This field is used for getting WiFi maximum transmitting power, call esp_wifi_set_max_tx_power to set the maximum transmitting power. */ -// wifi_country_policy_t policy; /**< country policy */ -// } wifi_country_t; -const wifi_country_t WM_COUNTRY_US{"US",1,11,CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER,WIFI_COUNTRY_POLICY_AUTO}; -const wifi_country_t WM_COUNTRY_CN{"CN",1,13,CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER,WIFI_COUNTRY_POLICY_AUTO}; -const wifi_country_t WM_COUNTRY_JP{"JP",1,14,CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER,WIFI_COUNTRY_POLICY_AUTO}; -#elif defined(ESP8266) && !defined(WM_NOCOUNTRY) -// typedef struct { -// char cc[3]; /**< country code string */ -// uint8_t schan; /**< start channel */ -// uint8_t nchan; /**< total channel number */ -// uint8_t policy; /**< country policy */ -// } wifi_country_t; -const wifi_country_t WM_COUNTRY_US{"US",1,11,WIFI_COUNTRY_POLICY_AUTO}; -const wifi_country_t WM_COUNTRY_CN{"CN",1,13,WIFI_COUNTRY_POLICY_AUTO}; -const wifi_country_t WM_COUNTRY_JP{"JP",1,14,WIFI_COUNTRY_POLICY_AUTO}; -#endif - - -/* -* ESP32 WiFi Events - -0 SYSTEM_EVENT_WIFI_READY < ESP32 WiFi ready -1 SYSTEM_EVENT_SCAN_DONE < ESP32 finish scanning AP -2 SYSTEM_EVENT_STA_START < ESP32 station start -3 SYSTEM_EVENT_STA_STOP < ESP32 station stop -4 SYSTEM_EVENT_STA_CONNECTED < ESP32 station connected to AP -5 SYSTEM_EVENT_STA_DISCONNECTED < ESP32 station disconnected from AP -6 SYSTEM_EVENT_STA_AUTHMODE_CHANGE < the auth mode of AP connected by ESP32 station changed -7 SYSTEM_EVENT_STA_GOT_IP < ESP32 station got IP from connected AP -8 SYSTEM_EVENT_STA_LOST_IP < ESP32 station lost IP and the IP is reset to 0 -9 SYSTEM_EVENT_STA_WPS_ER_SUCCESS < ESP32 station wps succeeds in enrollee mode -10 SYSTEM_EVENT_STA_WPS_ER_FAILED < ESP32 station wps fails in enrollee mode -11 SYSTEM_EVENT_STA_WPS_ER_TIMEOUT < ESP32 station wps timeout in enrollee mode -12 SYSTEM_EVENT_STA_WPS_ER_PIN < ESP32 station wps pin code in enrollee mode -13 SYSTEM_EVENT_AP_START < ESP32 soft-AP start -14 SYSTEM_EVENT_AP_STOP < ESP32 soft-AP stop -15 SYSTEM_EVENT_AP_STACONNECTED < a station connected to ESP32 soft-AP -16 SYSTEM_EVENT_AP_STADISCONNECTED < a station disconnected from ESP32 soft-AP -17 SYSTEM_EVENT_AP_STAIPASSIGNED < ESP32 soft-AP assign an IP to a connected station -18 SYSTEM_EVENT_AP_PROBEREQRECVED < Receive probe request packet in soft-AP interface -19 SYSTEM_EVENT_GOT_IP6 < ESP32 station or ap or ethernet interface v6IP addr is preferred -20 SYSTEM_EVENT_ETH_START < ESP32 ethernet start -21 SYSTEM_EVENT_ETH_STOP < ESP32 ethernet stop -22 SYSTEM_EVENT_ETH_CONNECTED < ESP32 ethernet phy link up -23 SYSTEM_EVENT_ETH_DISCONNECTED < ESP32 ethernet phy link down -24 SYSTEM_EVENT_ETH_GOT_IP < ESP32 ethernet got IP from connected AP -25 SYSTEM_EVENT_MAX - - -typedef enum { - ARDUINO_EVENT_WIFI_READY = 0, - ARDUINO_EVENT_WIFI_SCAN_DONE, - ARDUINO_EVENT_WIFI_STA_START, - ARDUINO_EVENT_WIFI_STA_STOP, - ARDUINO_EVENT_WIFI_STA_CONNECTED, - ARDUINO_EVENT_WIFI_STA_DISCONNECTED, - ARDUINO_EVENT_WIFI_STA_AUTHMODE_CHANGE, - ARDUINO_EVENT_WIFI_STA_GOT_IP, - ARDUINO_EVENT_WIFI_STA_GOT_IP6, - ARDUINO_EVENT_WIFI_STA_LOST_IP, - ARDUINO_EVENT_WIFI_AP_START, - ARDUINO_EVENT_WIFI_AP_STOP, - ARDUINO_EVENT_WIFI_AP_STACONNECTED, - ARDUINO_EVENT_WIFI_AP_STADISCONNECTED, - ARDUINO_EVENT_WIFI_AP_STAIPASSIGNED, - ARDUINO_EVENT_WIFI_AP_PROBEREQRECVED, - ARDUINO_EVENT_WIFI_AP_GOT_IP6, - ARDUINO_EVENT_WIFI_FTM_REPORT, - ARDUINO_EVENT_ETH_START, - ARDUINO_EVENT_ETH_STOP, - ARDUINO_EVENT_ETH_CONNECTED, - ARDUINO_EVENT_ETH_DISCONNECTED, - ARDUINO_EVENT_ETH_GOT_IP, - ARDUINO_EVENT_ETH_GOT_IP6, - ARDUINO_EVENT_WPS_ER_SUCCESS, - ARDUINO_EVENT_WPS_ER_FAILED, - ARDUINO_EVENT_WPS_ER_TIMEOUT, - ARDUINO_EVENT_WPS_ER_PIN, - ARDUINO_EVENT_WPS_ER_PBC_OVERLAP, - ARDUINO_EVENT_SC_SCAN_DONE, - ARDUINO_EVENT_SC_FOUND_CHANNEL, - ARDUINO_EVENT_SC_GOT_SSID_PSWD, - ARDUINO_EVENT_SC_SEND_ACK_DONE, - ARDUINO_EVENT_PROV_INIT, - ARDUINO_EVENT_PROV_DEINIT, - ARDUINO_EVENT_PROV_START, - ARDUINO_EVENT_PROV_END, - ARDUINO_EVENT_PROV_CRED_RECV, - ARDUINO_EVENT_PROV_CRED_FAIL, - ARDUINO_EVENT_PROV_CRED_SUCCESS, - ARDUINO_EVENT_MAX -} arduino_event_id_t; - -typedef union { - wifi_event_sta_scan_done_t wifi_scan_done; - wifi_event_sta_authmode_change_t wifi_sta_authmode_change; - wifi_event_sta_connected_t wifi_sta_connected; - wifi_event_sta_disconnected_t wifi_sta_disconnected; - wifi_event_sta_wps_er_pin_t wps_er_pin; - wifi_event_sta_wps_fail_reason_t wps_fail_reason; - wifi_event_ap_probe_req_rx_t wifi_ap_probereqrecved; - wifi_event_ap_staconnected_t wifi_ap_staconnected; - wifi_event_ap_stadisconnected_t wifi_ap_stadisconnected; - wifi_event_ftm_report_t wifi_ftm_report; - ip_event_ap_staipassigned_t wifi_ap_staipassigned; - ip_event_got_ip_t got_ip; - ip_event_got_ip6_t got_ip6; - smartconfig_event_got_ssid_pswd_t sc_got_ssid_pswd; - esp_eth_handle_t eth_connected; - wifi_sta_config_t prov_cred_recv; - wifi_prov_sta_fail_reason_t prov_fail_reason; -} arduino_event_info_t; - -*/ - -#endif \ No newline at end of file diff --git a/lib/WiFiManager/include/wm_consts_fr.h b/lib/WiFiManager/include/wm_consts_fr.h deleted file mode 100644 index 1d78e45..0000000 --- a/lib/WiFiManager/include/wm_consts_fr.h +++ /dev/null @@ -1,279 +0,0 @@ -/** - * wm_consts.h - * internal const strings/tokens - * WiFiManager, a library for the ESP8266/Arduino platform - * for configuration of WiFi credentials using a Captive Portal - * - * @author Creator tzapu - * @author tablatronix - * @author Alex Hope-O'Connor - * @translated AByGCreation - * @license MIT - */ - -#ifndef _WM_CONSTS_H -#define _WM_CONSTS_H - - -// ----------------------------------------------------------------------------------------------- -// TOKENS - -const char WM_VERSION_STR[] PROGMEM = "v2.0.17"; - -static const char _wifi_token[] PROGMEM = "wifi"; -static const char _wifinoscan_token[] PROGMEM = "wifinoscan"; -static const char _info_token[] PROGMEM = "info"; -static const char _param_token[] PROGMEM = "param"; -static const char _close_token[] PROGMEM = "close"; -static const char _restart_token[] PROGMEM = "restart"; -static const char _exit_token[] PROGMEM = "exit"; -static const char _erase_token[] PROGMEM = "erase"; -static const char _update_token[] PROGMEM = "update"; -static const char _sep_token[] PROGMEM = "sep"; -static const char _custom_token[] PROGMEM = "custom"; -static PGM_P _menutokens[] PROGMEM = { - _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)); - - -// Routes -const char R_root[] PROGMEM = "/"; -const char R_wifi[] PROGMEM = "/wifi"; -const char R_wifinoscan[] PROGMEM = "/0wifi"; -const char R_wifisave[] PROGMEM = "/wifisave"; -const char R_info[] PROGMEM = "/info"; -const char R_param[] PROGMEM = "/param"; -const char R_paramsave[] PROGMEM = "/paramsave"; -const char R_restart[] PROGMEM = "/restart"; -const char R_exit[] PROGMEM = "/exit"; -const char R_close[] PROGMEM = "/close"; -const char R_erase[] PROGMEM = "/erase"; -const char R_status[] PROGMEM = "/status"; -const char R_update[] PROGMEM = "/update"; -const char R_updatedone[] PROGMEM = "/u"; - - -// Classes -const char C_root[] PROGMEM = "home"; -const char C_wifi[] PROGMEM = "wifi"; -const char C_info[] PROGMEM = "info"; -const char C_param[] PROGMEM = "param"; -const char C_close[] PROGMEM = "close"; -const char C_restart[] PROGMEM = "restart"; -const char C_exit[] PROGMEM = "exit"; -const char C_erase[] PROGMEM = "erase"; -const char C_update[] PROGMEM = "update"; - - -//Strings -const char S_ip[] PROGMEM = "ip"; -const char S_gw[] PROGMEM = "gw"; -const char S_sn[] PROGMEM = "sn"; -const char S_dns[] PROGMEM = "dns"; - - - -//Tokens -//@todo consolidate and reduce -const char T_ss[] PROGMEM = "{"; // token start sentinel -const char T_es[] PROGMEM = "}"; // token end sentinel -const char T_1[] PROGMEM = "{1}"; // @token 1 -const char T_2[] PROGMEM = "{2}"; // @token 2 -const char T_3[] PROGMEM = "{3}"; // @token 2 -const char T_v[] PROGMEM = "{v}"; // @token v -const char T_V[] PROGMEM = "{V}"; // @token v -const char T_I[] PROGMEM = "{I}"; // @token I -const char T_i[] PROGMEM = "{i}"; // @token i -const char T_n[] PROGMEM = "{n}"; // @token n -const char T_p[] PROGMEM = "{p}"; // @token p -const char T_t[] PROGMEM = "{t}"; // @token t -const char T_l[] PROGMEM = "{l}"; // @token l -const char T_c[] PROGMEM = "{c}"; // @token c -const char T_e[] PROGMEM = "{e}"; // @token e -const char T_q[] PROGMEM = "{q}"; // @token q -const char T_r[] PROGMEM = "{r}"; // @token r -const char T_R[] PROGMEM = "{R}"; // @token R -const char T_h[] PROGMEM = "{h}"; // @token h - -// http -const char HTTP_HEAD_CL[] PROGMEM = "Content-Length"; -const char HTTP_HEAD_CT[] PROGMEM = "text/html"; -const char HTTP_HEAD_CT2[] PROGMEM = "text/plain"; -const char HTTP_HEAD_CORS[] PROGMEM = "Access-Control-Allow-Origin"; -const char HTTP_HEAD_CORS_ALLOW_ALL[] PROGMEM = "*"; - -const char * const WIFI_STA_STATUS[] PROGMEM -{ - "WL_IDLE_STATUS", // 0 STATION_IDLE - "WL_NO_SSID_AVAIL", // 1 STATION_NO_AP_FOUND - "WL_SCAN_COMPLETED", // 2 - "WL_CONNECTED", // 3 STATION_GOT_IP - "WL_CONNECT_FAILED", // 4 STATION_CONNECT_FAIL, STATION_WRONG_PASSWORD(NI) - "WL_CONNECTION_LOST", // 5 - "WL_DISCONNECTED", // 6 - "WL_STATION_WRONG_PASSWORD" // 7 KLUDGE -}; - -#ifdef ESP32 -const char * const AUTH_MODE_NAMES[] PROGMEM -{ - "OPEN", - "WEP", - "WPA_PSK", - "WPA2_PSK", - "WPA_WPA2_PSK", - "WPA2_ENTERPRISE", - "MAX" -}; -#elif defined(ESP8266) -const char * const AUTH_MODE_NAMES[] PROGMEM -{ - "", - "", - "WPA_PSK", // 2 ENC_TYPE_TKIP - "", - "WPA2_PSK", // 4 ENC_TYPE_CCMP - "WEP", // 5 ENC_TYPE_WEP - "", - "OPEN", //7 ENC_TYPE_NONE - "WPA_WPA2_PSK", // 8 ENC_TYPE_AUTO -}; -#endif - -const char* const WIFI_MODES[] PROGMEM = { "NULL", "STA", "AP", "STA+AP" }; - - -#ifdef ESP32 -// as 2.5.2 -// typedef struct { -// char cc[3]; /**< country code string */ -// uint8_t schan; /**< start channel */ -// uint8_t nchan; /**< total channel number */ -// int8_t max_tx_power; /**< This field is used for getting WiFi maximum transmitting power, call esp_wifi_set_max_tx_power to set the maximum transmitting power. */ -// wifi_country_policy_t policy; /**< country policy */ -// } wifi_country_t; -const wifi_country_t WM_COUNTRY_US{"US",1,11,CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER,WIFI_COUNTRY_POLICY_AUTO}; -const wifi_country_t WM_COUNTRY_CN{"CN",1,13,CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER,WIFI_COUNTRY_POLICY_AUTO}; -const wifi_country_t WM_COUNTRY_JP{"JP",1,14,CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER,WIFI_COUNTRY_POLICY_AUTO}; -#elif defined(ESP8266) && !defined(WM_NOCOUNTRY) -// typedef struct { -// char cc[3]; /**< country code string */ -// uint8_t schan; /**< start channel */ -// uint8_t nchan; /**< total channel number */ -// uint8_t policy; /**< country policy */ -// } wifi_country_t; -const wifi_country_t WM_COUNTRY_US{"US",1,11,WIFI_COUNTRY_POLICY_AUTO}; -const wifi_country_t WM_COUNTRY_CN{"CN",1,13,WIFI_COUNTRY_POLICY_AUTO}; -const wifi_country_t WM_COUNTRY_JP{"JP",1,14,WIFI_COUNTRY_POLICY_AUTO}; -#endif - - -/* -* ESP32 WiFi Events - -0 SYSTEM_EVENT_WIFI_READY < ESP32 WiFi ready -1 SYSTEM_EVENT_SCAN_DONE < ESP32 finish scanning AP -2 SYSTEM_EVENT_STA_START < ESP32 station start -3 SYSTEM_EVENT_STA_STOP < ESP32 station stop -4 SYSTEM_EVENT_STA_CONNECTED < ESP32 station connected to AP -5 SYSTEM_EVENT_STA_DISCONNECTED < ESP32 station disconnected from AP -6 SYSTEM_EVENT_STA_AUTHMODE_CHANGE < the auth mode of AP connected by ESP32 station changed -7 SYSTEM_EVENT_STA_GOT_IP < ESP32 station got IP from connected AP -8 SYSTEM_EVENT_STA_LOST_IP < ESP32 station lost IP and the IP is reset to 0 -9 SYSTEM_EVENT_STA_WPS_ER_SUCCESS < ESP32 station wps succeeds in enrollee mode -10 SYSTEM_EVENT_STA_WPS_ER_FAILED < ESP32 station wps fails in enrollee mode -11 SYSTEM_EVENT_STA_WPS_ER_TIMEOUT < ESP32 station wps timeout in enrollee mode -12 SYSTEM_EVENT_STA_WPS_ER_PIN < ESP32 station wps pin code in enrollee mode -13 SYSTEM_EVENT_AP_START < ESP32 soft-AP start -14 SYSTEM_EVENT_AP_STOP < ESP32 soft-AP stop -15 SYSTEM_EVENT_AP_STACONNECTED < a station connected to ESP32 soft-AP -16 SYSTEM_EVENT_AP_STADISCONNECTED < a station disconnected from ESP32 soft-AP -17 SYSTEM_EVENT_AP_STAIPASSIGNED < ESP32 soft-AP assign an IP to a connected station -18 SYSTEM_EVENT_AP_PROBEREQRECVED < Receive probe request packet in soft-AP interface -19 SYSTEM_EVENT_GOT_IP6 < ESP32 station or ap or ethernet interface v6IP addr is preferred -20 SYSTEM_EVENT_ETH_START < ESP32 ethernet start -21 SYSTEM_EVENT_ETH_STOP < ESP32 ethernet stop -22 SYSTEM_EVENT_ETH_CONNECTED < ESP32 ethernet phy link up -23 SYSTEM_EVENT_ETH_DISCONNECTED < ESP32 ethernet phy link down -24 SYSTEM_EVENT_ETH_GOT_IP < ESP32 ethernet got IP from connected AP -25 SYSTEM_EVENT_MAX - - -typedef enum { - ARDUINO_EVENT_WIFI_READY = 0, - ARDUINO_EVENT_WIFI_SCAN_DONE, - ARDUINO_EVENT_WIFI_STA_START, - ARDUINO_EVENT_WIFI_STA_STOP, - ARDUINO_EVENT_WIFI_STA_CONNECTED, - ARDUINO_EVENT_WIFI_STA_DISCONNECTED, - ARDUINO_EVENT_WIFI_STA_AUTHMODE_CHANGE, - ARDUINO_EVENT_WIFI_STA_GOT_IP, - ARDUINO_EVENT_WIFI_STA_GOT_IP6, - ARDUINO_EVENT_WIFI_STA_LOST_IP, - ARDUINO_EVENT_WIFI_AP_START, - ARDUINO_EVENT_WIFI_AP_STOP, - ARDUINO_EVENT_WIFI_AP_STACONNECTED, - ARDUINO_EVENT_WIFI_AP_STADISCONNECTED, - ARDUINO_EVENT_WIFI_AP_STAIPASSIGNED, - ARDUINO_EVENT_WIFI_AP_PROBEREQRECVED, - ARDUINO_EVENT_WIFI_AP_GOT_IP6, - ARDUINO_EVENT_WIFI_FTM_REPORT, - ARDUINO_EVENT_ETH_START, - ARDUINO_EVENT_ETH_STOP, - ARDUINO_EVENT_ETH_CONNECTED, - ARDUINO_EVENT_ETH_DISCONNECTED, - ARDUINO_EVENT_ETH_GOT_IP, - ARDUINO_EVENT_ETH_GOT_IP6, - ARDUINO_EVENT_WPS_ER_SUCCESS, - ARDUINO_EVENT_WPS_ER_FAILED, - ARDUINO_EVENT_WPS_ER_TIMEOUT, - ARDUINO_EVENT_WPS_ER_PIN, - ARDUINO_EVENT_WPS_ER_PBC_OVERLAP, - ARDUINO_EVENT_SC_SCAN_DONE, - ARDUINO_EVENT_SC_FOUND_CHANNEL, - ARDUINO_EVENT_SC_GOT_SSID_PSWD, - ARDUINO_EVENT_SC_SEND_ACK_DONE, - ARDUINO_EVENT_PROV_INIT, - ARDUINO_EVENT_PROV_DEINIT, - ARDUINO_EVENT_PROV_START, - ARDUINO_EVENT_PROV_END, - ARDUINO_EVENT_PROV_CRED_RECV, - ARDUINO_EVENT_PROV_CRED_FAIL, - ARDUINO_EVENT_PROV_CRED_SUCCESS, - ARDUINO_EVENT_MAX -} arduino_event_id_t; - -typedef union { - wifi_event_sta_scan_done_t wifi_scan_done; - wifi_event_sta_authmode_change_t wifi_sta_authmode_change; - wifi_event_sta_connected_t wifi_sta_connected; - wifi_event_sta_disconnected_t wifi_sta_disconnected; - wifi_event_sta_wps_er_pin_t wps_er_pin; - wifi_event_sta_wps_fail_reason_t wps_fail_reason; - wifi_event_ap_probe_req_rx_t wifi_ap_probereqrecved; - wifi_event_ap_staconnected_t wifi_ap_staconnected; - wifi_event_ap_stadisconnected_t wifi_ap_stadisconnected; - wifi_event_ftm_report_t wifi_ftm_report; - ip_event_ap_staipassigned_t wifi_ap_staipassigned; - ip_event_got_ip_t got_ip; - ip_event_got_ip6_t got_ip6; - smartconfig_event_got_ssid_pswd_t sc_got_ssid_pswd; - esp_eth_handle_t eth_connected; - wifi_sta_config_t prov_cred_recv; - wifi_prov_sta_fail_reason_t prov_fail_reason; -} arduino_event_info_t; - -*/ - -#endif \ No newline at end of file diff --git a/lib/WiFiManager/include/wm_strings_en.h b/lib/WiFiManager/include/wm_strings_en.h deleted file mode 100644 index 06d371d..0000000 --- a/lib/WiFiManager/include/wm_strings_en.h +++ /dev/null @@ -1,279 +0,0 @@ -/** - * wm_strings_en.h - * engligh strings for - * WiFiManager, a library for the ESP8266/Arduino platform - * for configuration of WiFi credentials using a Captive Portal - * - * @author Creator tzapu - * @author tablatronix - * @author Alex Hope-O'Connor - * @license MIT - */ - -#ifndef _WM_STRINGS_EN_H_ -#define _WM_STRINGS_EN_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! -#include "wm_consts_en.h" // include constants, tokens, routes - -const char WM_LANGUAGE[] PROGMEM = "en-US"; // i18n lang code - -const char HTTP_HEAD_START[] PROGMEM = "" -"" -"" -"" -"" -"{v}"; - -const char HTTP_SCRIPT[] PROGMEM = ""; // @todo add button states, disable on click , show ack , spinner etc - -const char HTTP_HEAD_END[] PROGMEM = "

"; // {c} = _bodyclass -// example of embedded logo, base64 encoded inline, No styling here -// const char HTTP_ROOT_MAIN[] PROGMEM = "

{v}

WiFiManager

"; -const char HTTP_ROOT_MAIN[] PROGMEM = "

{t}

{v}

"; - -const char * const HTTP_PORTAL_MENU[] PROGMEM = { -"

\n", // MENU_WIFI -"

\n", // MENU_WIFINOSCAN -"

\n", // MENU_INFO -"

\n",//MENU_PARAM -"

\n", // MENU_CLOSE -"

\n",// MENU_RESTART -"

\n", // MENU_EXIT -"

\n", // MENU_ERASE -"

\n",// MENU_UPDATE -"

" // 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 = ""; // rssi icons -const char HTTP_ITEM_QP[] PROGMEM = "
{r}%
"; // rssi percentage {h} = hidden showperc pref -const char HTTP_ITEM[] PROGMEM = "
{v}{qi}{qp}
"; // {q} = HTTP_ITEM_QI, {r} = HTTP_ITEM_QP -// const char HTTP_ITEM[] PROGMEM = "
{v} {R} {r}% {q} {e}
"; // test all tokens - -const char HTTP_FORM_START[] PROGMEM = "
"; -const char HTTP_FORM_WIFI[] PROGMEM = "

"; -const char HTTP_FORM_WIFI_END[] PROGMEM = ""; -const char HTTP_FORM_STATIC_HEAD[] PROGMEM = "

"; -const char HTTP_FORM_END[] PROGMEM = "

"; -const char HTTP_FORM_LABEL[] PROGMEM = ""; -const char HTTP_FORM_PARAM_HEAD[] PROGMEM = "

"; -const char HTTP_FORM_PARAM[] PROGMEM = "
\n"; // do not remove newline! - -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_PARAMSAVED[] PROGMEM = "
Saved
"; -const char HTTP_END[] PROGMEM = "
"; -const char HTTP_ERASEBTN[] PROGMEM = "
"; -const char HTTP_UPDATEBTN[] PROGMEM = "
"; -const char HTTP_BACKBTN[] PROGMEM = "

"; - -const char HTTP_STATUS_ON[] PROGMEM = "
Connected to {v}
with IP {i}
"; -const char HTTP_STATUS_OFF[] PROGMEM = "
Not connected to {v}{r}
"; // {c=class} {v=ssid} {r=status_off} -const char HTTP_STATUS_OFFPW[] PROGMEM = "
Authentication failure"; // STATION_WRONG_PASSWORD, no eps32 -const char HTTP_STATUS_OFFNOAP[] PROGMEM = "
AP not found"; // WL_NO_SSID_AVAIL -const char HTTP_STATUS_OFFFAIL[] PROGMEM = "
Could not connect"; // WL_CONNECT_FAILED -const char HTTP_STATUS_NONE[] PROGMEM = "
No AP set
"; -const char HTTP_BR[] PROGMEM = "
"; - -const char HTTP_STYLE[] PROGMEM = ""; - -#ifndef WM_NOHELP -const char HTTP_HELP[] PROGMEM = - "

Available pages

" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "
PageFunction
/Menu page.
/wifiShow WiFi scan results and enter WiFi configuration.(/0wifi noscan)
/wifisaveSave WiFi configuration information and configure device. Needs variables supplied.
/paramParameter page
/infoInformation page
/uOTA Update
/closeClose the captiveportal popup, config portal will remain active
/exitExit Config portal, config portal will close
/restartReboot the device
/eraseErase WiFi configuration and reboot device. Device will not reconnect to a network until new WiFi configuration data is entered.
" - "

Github https://github.com/tzapu/WiFiManager."; -#else -const char HTTP_HELP[] PROGMEM = ""; -#endif - -const char HTTP_UPDATE[] PROGMEM = "Upload new firmware

* May not function inside captive portal, open in browser http://192.168.4.1"; -const char HTTP_UPDATE_FAIL[] PROGMEM = "
Update failed!
Reboot device and try again
"; -const char HTTP_UPDATE_SUCCESS[] PROGMEM = "
Update successful.
Device rebooting now...
"; - -#ifdef WM_JSTEST -const char HTTP_JS[] PROGMEM = -""; -#endif - -// Info html -// @todo remove html elements from progmem, repetetive strings -#ifdef ESP32 - const char HTTP_INFO_esphead[] PROGMEM = "

esp32

"; - const char HTTP_INFO_chiprev[] PROGMEM = "
Chip rev
{1}
"; - const char HTTP_INFO_lastreset[] PROGMEM = "
Last reset reason
CPU0: {1}
CPU1: {2}
"; - const char HTTP_INFO_aphost[] PROGMEM = "
Access point hostname
{1}
"; - const char HTTP_INFO_psrsize[] PROGMEM = "
PSRAM Size
{1} bytes
"; - const char HTTP_INFO_temp[] PROGMEM = "
Temperature
{1} C° / {2} F°
"; - const char HTTP_INFO_hall[] PROGMEM = "
Hall
{1}
"; -#else - const char HTTP_INFO_esphead[] PROGMEM = "

esp8266

"; - const char HTTP_INFO_fchipid[] PROGMEM = "
Flash chip ID
{1}
"; - const char HTTP_INFO_corever[] PROGMEM = "
Core version
{1}
"; - const char HTTP_INFO_bootver[] PROGMEM = "
Boot version
{1}
"; - const char HTTP_INFO_lastreset[] PROGMEM = "
Last reset reason
{1}
"; - const char HTTP_INFO_flashsize[] PROGMEM = "
Real flash size
{1} bytes
"; -#endif - -const char HTTP_INFO_memsmeter[] PROGMEM = "
"; -const char HTTP_INFO_memsketch[] PROGMEM = "
Memory - Sketch size
Used / Total bytes
{1} / {2}"; -const char HTTP_INFO_freeheap[] PROGMEM = "
Memory - Free heap
{1} bytes available
"; -const char HTTP_INFO_wifihead[] PROGMEM = "

WiFi

"; -const char HTTP_INFO_uptime[] PROGMEM = "
Uptime
{1} mins {2} secs
"; -const char HTTP_INFO_chipid[] PROGMEM = "
Chip ID
{1}
"; -const char HTTP_INFO_idesize[] PROGMEM = "
Flash size
{1} bytes
"; -const char HTTP_INFO_sdkver[] PROGMEM = "
SDK version
{1}
"; -const char HTTP_INFO_cpufreq[] PROGMEM = "
CPU frequency
{1}MHz
"; -const char HTTP_INFO_apip[] PROGMEM = "
Access point IP
{1}
"; -const char HTTP_INFO_apmac[] PROGMEM = "
Access point MAC
{1}
"; -const char HTTP_INFO_apssid[] PROGMEM = "
Access point SSID
{1}
"; -const char HTTP_INFO_apbssid[] PROGMEM = "
BSSID
{1}
"; -const char HTTP_INFO_stassid[] PROGMEM = "
Station SSID
{1}
"; -const char HTTP_INFO_staip[] PROGMEM = "
Station IP
{1}
"; -const char HTTP_INFO_stagw[] PROGMEM = "
Station gateway
{1}
"; -const char HTTP_INFO_stasub[] PROGMEM = "
Station subnet
{1}
"; -const char HTTP_INFO_dnss[] PROGMEM = "
DNS Server
{1}
"; -const char HTTP_INFO_host[] PROGMEM = "
Hostname
{1}
"; -const char HTTP_INFO_stamac[] PROGMEM = "
Station MAC
{1}
"; -const char HTTP_INFO_conx[] PROGMEM = "
Connected
{1}
"; -const char HTTP_INFO_autoconx[] PROGMEM = "
Autoconnect
{1}
"; - -const char HTTP_INFO_aboutver[] PROGMEM = "
WiFiManager
{1}
"; -const char HTTP_INFO_aboutarduino[] PROGMEM = "
Arduino
{1}
"; -const char HTTP_INFO_aboutsdk[] PROGMEM = "
ESP-SDK/IDF
{1}
"; -const char HTTP_INFO_aboutdate[] PROGMEM = "
Build date
{1}
"; - -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 diff --git a/lib/WiFiManager/include/wm_strings_es.h b/lib/WiFiManager/include/wm_strings_es.h deleted file mode 100644 index 6a73111..0000000 --- a/lib/WiFiManager/include/wm_strings_es.h +++ /dev/null @@ -1,282 +0,0 @@ -/** - * 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 - * @author Alex Hope-O'Connor - * @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 = "" -"" -"" -"" -"" -"{v}"; - -const char HTTP_SCRIPT[] PROGMEM = ""; // @todo add button states, disable on click , show ack , spinner etc - -const char HTTP_HEAD_END[] PROGMEM = "
"; // {c} = _bodyclass -// example of embedded logo, base64 encoded inline, No styling here -// const char HTTP_ROOT_MAIN[] PROGMEM = "

{v}

WiFiManager

"; -const char HTTP_ROOT_MAIN[] PROGMEM = "

{t}

{v}

"; - -const char * const HTTP_PORTAL_MENU[] PROGMEM = { -"

\n", // MENU_WIFI -"

\n", // MENU_WIFINOSCAN -"

\n", // MENU_INFO -"

\n",//MENU_PARAM -"

\n", // MENU_CLOSE -"

\n",// MENU_RESTART -"

\n", // MENU_EXIT -"

\n", // MENU_ERASE -"

\n",// MENU_UPDATE -"

" // 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 = ""; // rssi icons -const char HTTP_ITEM_QP[] PROGMEM = "
{r}%
"; // rssi percentage {h} = hidden showperc pref -const char HTTP_ITEM[] PROGMEM = "
{v}{qi}{qp}
"; // {q} = HTTP_ITEM_QI, {r} = HTTP_ITEM_QP -// const char HTTP_ITEM[] PROGMEM = "
{v} {R} {r}% {q} {e}
"; // test all tokens - -const char HTTP_FORM_START[] PROGMEM = "
"; -const char HTTP_FORM_WIFI[] PROGMEM = "
Mostrar contraseña"; -const char HTTP_FORM_WIFI_END[] PROGMEM = ""; -const char HTTP_FORM_STATIC_HEAD[] PROGMEM = "

"; -const char HTTP_FORM_END[] PROGMEM = "

"; -const char HTTP_FORM_LABEL[] PROGMEM = ""; -const char HTTP_FORM_PARAM_HEAD[] PROGMEM = "

"; -const char HTTP_FORM_PARAM[] PROGMEM = "
\n"; // do not remove newline! - -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_PARAMSAVED[] PROGMEM = "
Saved
"; -const char HTTP_END[] PROGMEM = "
"; -const char HTTP_ERASEBTN[] PROGMEM = "
"; -const char HTTP_UPDATEBTN[] PROGMEM = "
"; -const char HTTP_BACKBTN[] PROGMEM = "

"; - -const char HTTP_STATUS_ON[] PROGMEM = "
Conectado a {v}
con IP {i}
"; -const char HTTP_STATUS_OFF[] PROGMEM = "
No conectado a {v}{r}
"; // {c=class} {v=ssid} {r=status_off} -const char HTTP_STATUS_OFFPW[] PROGMEM = "
Authentication Failure"; // STATION_WRONG_PASSWORD, no eps32 -const char HTTP_STATUS_OFFNOAP[] PROGMEM = "
No Encontrado"; // WL_NO_SSID_AVAIL -const char HTTP_STATUS_OFFFAIL[] PROGMEM = "
No se pudo conectar"; // WL_CONNECT_FAILED -const char HTTP_STATUS_NONE[] PROGMEM = "
Sin AP establecido
"; -const char HTTP_BR[] PROGMEM = "
"; - -const char HTTP_STYLE[] PROGMEM = ""; - -#ifndef WM_NOHELP -const char HTTP_HELP[] PROGMEM = - "

Available Pages

" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "
PageFunction
/Menu page.
/wifiShow WiFi scan results and enter WiFi configuration.(/0wifi noscan)
/wifisaveSave WiFi configuration information and configure device. Needs variables supplied.
/paramParameter page
/infoInformation page
/uOTA Update
/closeClose the captiveportal popup,configportal will remain active
/exitExit Config Portal, configportal will close
/restartReboot the device
/eraseErase WiFi configuration and reboot Device. Device will not reconnect to a network until new WiFi configuration data is entered.
" - "

Github https://github.com/tzapu/WiFiManager."; -#else -const char HTTP_HELP[] PROGMEM = ""; -#endif - -const char HTTP_UPDATE[] PROGMEM = "Upload New Firmware

* May not function inside captive portal, Open in browser http://192.168.4.1"; -const char HTTP_UPDATE_FAIL[] PROGMEM = "
Update Failed!
Reboot device and try again
"; -const char HTTP_UPDATE_SUCCESS[] PROGMEM = "
Update Successful.
Device Rebooting now...
"; - -#ifdef WM_JSTEST -const char HTTP_JS[] PROGMEM = -""; -#endif - -// Info html -// @todo remove html elements from progmem, repetetive strings -#ifdef ESP32 - const char HTTP_INFO_esphead[] PROGMEM = "

esp32

"; - const char HTTP_INFO_chiprev[] PROGMEM = "
Chip Rev
{1}
"; - const char HTTP_INFO_lastreset[] PROGMEM = "
Last reset reason
CPU0: {1}
CPU1: {2}
"; - const char HTTP_INFO_aphost[] PROGMEM = "
Access Point Hostname
{1}
"; - const char HTTP_INFO_psrsize[] PROGMEM = "
PSRAM Size
{1} bytes
"; - const char HTTP_INFO_temp[] PROGMEM = "
Temperature
{1} C° / {2} F°
Hall
{3}
"; -#else - const char HTTP_INFO_esphead[] PROGMEM = "

esp8266

"; - const char HTTP_INFO_fchipid[] PROGMEM = "
Flash Chip ID
{1}
"; - const char HTTP_INFO_corever[] PROGMEM = "
Core Version
{1}
"; - const char HTTP_INFO_bootver[] PROGMEM = "
Boot Version
{1}
"; - const char HTTP_INFO_lastreset[] PROGMEM = "
Last reset reason
{1}
"; - const char HTTP_INFO_flashsize[] PROGMEM = "
Real Flash Size
{1} bytes
"; -#endif - -const char HTTP_INFO_memsmeter[] PROGMEM = "
"; -const char HTTP_INFO_memsketch[] PROGMEM = "
Memory - Sketch Size
Used / Total bytes
{1} / {2}"; -const char HTTP_INFO_freeheap[] PROGMEM = "
Memory - Free Heap
{1} bytes available
"; -const char HTTP_INFO_wifihead[] PROGMEM = "

WiFi

"; -const char HTTP_INFO_uptime[] PROGMEM = "
Uptime
{1} Mins {2} Secs
"; -const char HTTP_INFO_chipid[] PROGMEM = "
Chip ID
{1}
"; -const char HTTP_INFO_idesize[] PROGMEM = "
Flash Size
{1} bytes
"; -const char HTTP_INFO_sdkver[] PROGMEM = "
SDK Version
{1}
"; -const char HTTP_INFO_cpufreq[] PROGMEM = "
CPU Frequency
{1}MHz
"; -const char HTTP_INFO_apip[] PROGMEM = "
Access Point IP
{1}
"; -const char HTTP_INFO_apmac[] PROGMEM = "
Access Point MAC
{1}
"; -const char HTTP_INFO_apssid[] PROGMEM = "
Access Point SSID
{1}
"; -const char HTTP_INFO_apbssid[] PROGMEM = "
BSSID
{1}
"; -const char HTTP_INFO_stassid[] PROGMEM = "
Station SSID
{1}
"; -const char HTTP_INFO_staip[] PROGMEM = "
Station IP
{1}
"; -const char HTTP_INFO_stagw[] PROGMEM = "
Station Gateway
{1}
"; -const char HTTP_INFO_stasub[] PROGMEM = "
Station Subnet
{1}
"; -const char HTTP_INFO_dnss[] PROGMEM = "
DNS Server
{1}
"; -const char HTTP_INFO_host[] PROGMEM = "
Hostname
{1}
"; -const char HTTP_INFO_stamac[] PROGMEM = "
Station MAC
{1}
"; -const char HTTP_INFO_conx[] PROGMEM = "
Connected
{1}
"; -const char HTTP_INFO_autoconx[] PROGMEM = "
Autoconnect
{1}
"; - -const char HTTP_INFO_aboutver[] PROGMEM = "
WiFiManager
{1}
"; -const char HTTP_INFO_aboutarduino[] PROGMEM = "
Arduino
{1}
"; -const char HTTP_INFO_aboutsdk[] PROGMEM = "
ESP-SDK/IDF
{1}
"; -const char HTTP_INFO_aboutdate[] PROGMEM = "
Build Date
{1}
"; - -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 diff --git a/lib/WiFiManager/include/wm_strings_fr.h b/lib/WiFiManager/include/wm_strings_fr.h deleted file mode 100644 index 7a9ecf3..0000000 --- a/lib/WiFiManager/include/wm_strings_fr.h +++ /dev/null @@ -1,276 +0,0 @@ -/** - * wm_strings_fr.h - * French strings for - * WiFiManager, a library for the ESP8266/Arduino platform - * for configuration of WiFi credentials using a Captive Portal - * - * @author Creator tzapu - * @author tablatronix - * @author Alex Hope-O'Connor - * @translated AByGCreation - * @license MIT - */ - -#ifndef _WM_STRINGS_EN_H_ -#define _WM_STRINGS_EN_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! -#include "wm_consts_en.h" // include constants, tokens, routes - -const char WM_LANGUAGE[] PROGMEM = "fr-FR"; // i18n lang code - -const char HTTP_HEAD_START[] PROGMEM = "" -"" -"" -"" -"" -"{v}"; - -const char HTTP_SCRIPT[] PROGMEM = ""; // @todo add button states, disable on click , show ack , spinner etc - -const char HTTP_HEAD_END[] PROGMEM = "
"; // {c} = _bodyclass -// example of embedded logo, base64 encoded inline, No styling here -// const char HTTP_ROOT_MAIN[] PROGMEM = "

{v}

WiFiManager

"; -const char HTTP_ROOT_MAIN[] PROGMEM = "

{t}

{v}

"; - -const char * const HTTP_PORTAL_MENU[] PROGMEM = { -"

\n", // MENU_WIFI -"

\n", // MENU_WIFINOSCAN -"

\n", // MENU_INFO -"

\n",//MENU_PARAM -"

\n", // MENU_CLOSE -"

\n",// MENU_RESTART -"

\n", // MENU_EXIT -"

\n", // MENU_ERASE -"

\n",// MENU_UPDATE -"

" // 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 = ""; // rssi icons -const char HTTP_ITEM_QP[] PROGMEM = "
{r}%
"; // rssi percentage {h} = hidden showperc pref -const char HTTP_ITEM[] PROGMEM = "
{v}{qi}{qp}
"; // {q} = HTTP_ITEM_QI, {r} = HTTP_ITEM_QP -// const char HTTP_ITEM[] PROGMEM = "
{v} {R} {r}% {q} {e}
"; // test all tokens - -const char HTTP_FORM_START[] PROGMEM = "
"; -const char HTTP_FORM_WIFI[] PROGMEM = "

"; -const char HTTP_FORM_WIFI_END[] PROGMEM = ""; -const char HTTP_FORM_STATIC_HEAD[] PROGMEM = "

"; -const char HTTP_FORM_END[] PROGMEM = "

"; -const char HTTP_FORM_LABEL[] PROGMEM = ""; -const char HTTP_FORM_PARAM_HEAD[] PROGMEM = "

"; -const char HTTP_FORM_PARAM[] PROGMEM = "
\n"; // do not remove newline! - -const char HTTP_SCAN_LINK[] PROGMEM = "
"; -const char HTTP_SAVED[] PROGMEM = "
Enregistrer l'accès
L'ESP essai de se connecter au réseau.
Si échec, merci de vous reconnecter à nouveau.
"; -const char HTTP_PARAMSAVED[] PROGMEM = "
Enregistré
"; -const char HTTP_END[] PROGMEM = "
"; -const char HTTP_ERASEBTN[] PROGMEM = "
"; -const char HTTP_UPDATEBTN[] PROGMEM = "
"; -const char HTTP_BACKBTN[] PROGMEM = "

"; - -const char HTTP_STATUS_ON[] PROGMEM = "
Connecté to {v}
with IP {i}
"; -const char HTTP_STATUS_OFF[] PROGMEM = "
Non connecté à {v}{r}
"; // {c=class} {v=ssid} {r=status_off} -const char HTTP_STATUS_OFFPW[] PROGMEM = "
Echec d'authentication"; // STATION_WRONG_PASSWORD, no eps32 -const char HTTP_STATUS_OFFNOAP[] PROGMEM = "
Point d'accès introuvable"; // WL_NO_SSID_AVAIL -const char HTTP_STATUS_OFFFAIL[] PROGMEM = "
Impossible de se connecter"; // WL_CONNECT_FAILED -const char HTTP_STATUS_NONE[] PROGMEM = "
Aucune borne sélectionnée
"; -const char HTTP_BR[] PROGMEM = "
"; - -const char HTTP_STYLE[] PROGMEM = ""; - -#ifndef WM_NOHELP -const char HTTP_HELP[] PROGMEM = - "

Pages disponibles

" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "
Fonctions
/Menu.
/wifiAfficher les résultats de l'analyse WiFi et entrer dans la configuration WiFi.(/0wifi noscan)
/wifisaveSauvegarde les informations de configuration WiFi et configure l'appareil. Veuillez entrer vos informations de connexion
/paramParametres
/infoInformations
/uMise à jour OTA
/closeFermer la fenêtre contextuelle du portail captif, le portail de configuration reste actif.
/exitQuitter le portail de configuration, le portail de configuration se ferme
/restartRedémarrer l'appareil
/eraseEffacer la configuration WiFi et redémarrer l'appareil. L'appareil ne se reconnectera pas à un réseau tant que de nouvelles données de configuration WiFi n'auront pas été saisies.
" - "

Github https://github.com/tzapu/WiFiManager."; -#else -const char HTTP_HELP[] PROGMEM = ""; -#endif - -const char HTTP_UPDATE[] PROGMEM = "Charger le nouveau firmware

* Peut ne pas fonctionner à l'intérieur du portail captif, ouvrir dans le navigateur http://192.168.4.1"; -const char HTTP_UPDATE_FAIL[] PROGMEM = "
Echec de la mise à jour !
Redémarrer l'appareil et réessayer
"; -const char HTTP_UPDATE_SUCCESS[] PROGMEM = "
Mise à jour réussie.
L'appareil redémarre maintenant...
"; - -#ifdef WM_JSTEST -const char HTTP_JS[] PROGMEM = -""; -#endif - -// Info html -// @todo remove html elements from progmem, repetetive strings -#ifdef ESP32 - const char HTTP_INFO_esphead[] PROGMEM = "

esp32

"; - const char HTTP_INFO_chiprev[] PROGMEM = "
Version Puce
{1}
"; - const char HTTP_INFO_lastreset[] PROGMEM = "
Motif de la dernière réinitialisation
CPU0: {1}
CPU1: {2}
"; - const char HTTP_INFO_aphost[] PROGMEM = "
Nom du point d'accès
{1}
"; - const char HTTP_INFO_psrsize[] PROGMEM = "
Taille PSRAM
{1} octets
"; - const char HTTP_INFO_temp[] PROGMEM = "
Temperature
{1} C° / {2} F°
"; - const char HTTP_INFO_hall[] PROGMEM = "
Hall
{1}
"; -#else - const char HTTP_INFO_esphead[] PROGMEM = "

esp8266

"; - const char HTTP_INFO_fchipid[] PROGMEM = "
ID de la puce flash
{1}
"; - const char HTTP_INFO_corever[] PROGMEM = "
Version Core
{1}
"; - const char HTTP_INFO_bootver[] PROGMEM = "
Version Boot
{1}
"; - const char HTTP_INFO_lastreset[] PROGMEM = "
Motif de la dernière réinitialisation
{1}
"; - const char HTTP_INFO_flashsize[] PROGMEM = "
Taille réelle de la mémoire Flash
{1} octets
"; -#endif - -const char HTTP_INFO_memsmeter[] PROGMEM = "
"; -const char HTTP_INFO_memsketch[] PROGMEM = "
Mémoire - Taille du programme
Utilisée / Total
{1} / {2}"; -const char HTTP_INFO_freeheap[] PROGMEM = "
Mémoire - Tampon
{1} octets disponibles
"; -const char HTTP_INFO_wifihead[] PROGMEM = "

WiFi

"; -const char HTTP_INFO_uptime[] PROGMEM = "
Temps de fonctionnement
{1} mins {2} secs
"; -const char HTTP_INFO_chipid[] PROGMEM = "
ID de l'ESP
{1}
"; -const char HTTP_INFO_idesize[] PROGMEM = "
Taille mémoire Flash
{1} octets
"; -const char HTTP_INFO_sdkver[] PROGMEM = "
Version SDK
{1}
"; -const char HTTP_INFO_cpufreq[] PROGMEM = "
Fréquence processeur
{1}MHz
"; -const char HTTP_INFO_apip[] PROGMEM = "
IP du point d'accès
{1}
"; -const char HTTP_INFO_apmac[] PROGMEM = "
Adresse MAC du point d'accès
{1}
"; -const char HTTP_INFO_apssid[] PROGMEM = "
SSID du point d'accès
{1}
"; -const char HTTP_INFO_apbssid[] PROGMEM = "
BSSID
{1}
"; -const char HTTP_INFO_stassid[] PROGMEM = "
Identifiant réseau WiFi
{1}
"; -const char HTTP_INFO_staip[] PROGMEM = "
Adresse IP
{1}
"; -const char HTTP_INFO_stagw[] PROGMEM = "
Passerelle
{1}
"; -const char HTTP_INFO_stasub[] PROGMEM = "
Masque de sous-réseau
{1}
"; -const char HTTP_INFO_dnss[] PROGMEM = "
Serveur DNS
{1}
"; -const char HTTP_INFO_host[] PROGMEM = "
Nom d'hôte
{1}
"; -const char HTTP_INFO_stamac[] PROGMEM = "
Adresse MAC
{1}
"; -const char HTTP_INFO_conx[] PROGMEM = "
Connecté
{1}
"; -const char HTTP_INFO_autoconx[] PROGMEM = "
Autoconnect
{1}
"; - -const char HTTP_INFO_aboutver[] PROGMEM = "
WiFiManager
{1}
"; -const char HTTP_INFO_aboutarduino[] PROGMEM = "
Arduino
{1}
"; -const char HTTP_INFO_aboutsdk[] PROGMEM = "
ESP-SDK/IDF
{1}
"; -const char HTTP_INFO_aboutdate[] PROGMEM = "
Date de compilation
{1}
"; - -const char S_brand[] PROGMEM = "WiFiManager"; -const char S_debugPrefix[] PROGMEM = "*wm:"; -const char S_y[] PROGMEM = "Oui"; -const char S_n[] PROGMEM = "Non"; -const char S_enable[] PROGMEM = "Activé"; -const char S_disable[] PROGMEM = "Desactivé"; -const char S_GET[] PROGMEM = "GET"; -const char S_POST[] PROGMEM = "POST"; -const char S_NA[] PROGMEM = "Inconnue"; -const char S_passph[] PROGMEM = "********"; -const char S_titlewifisaved[] PROGMEM = "Identifiants sauvegardés"; -const char S_titlewifisettings[] PROGMEM = "Paramètres enregistrés"; -const char S_titlewifi[] PROGMEM = "Configuration ESP"; -const char S_titleinfo[] PROGMEM = "Info"; -const char S_titleparam[] PROGMEM = "Configuration"; -const char S_titleparamsaved[] PROGMEM = "Configuration sauvegardée"; -const char S_titleexit[] PROGMEM = "Quitter"; -const char S_titlereset[] PROGMEM = "Réinitialiser"; -const char S_titleerase[] PROGMEM = "Effacer"; -const char S_titleclose[] PROGMEM = "Fermer"; -const char S_options[] PROGMEM = "options"; -const char S_nonetworks[] PROGMEM = "Aucun réseau trouvé. Rafraîchir pour scanner à nouveau."; -const char S_staticip[] PROGMEM = "IP Statique"; -const char S_staticgw[] PROGMEM = "Passerelle"; -const char S_staticdns[] PROGMEM = "DNS"; -const char S_subnet[] PROGMEM = "Sous réseau"; -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 diff --git a/lib/WiFiManager/src/WiFiManager.cpp b/lib/WiFiManager/src/WiFiManager.cpp index cb7fd7a..403ad44 100644 --- a/lib/WiFiManager/src/WiFiManager.cpp +++ b/lib/WiFiManager/src/WiFiManager.cpp @@ -11,7 +11,7 @@ */ #include "WiFiManager.h" -#include "WiFiManagerServer.h" +#include "WiFiManagerServer.h" // Need menu tokens #if defined(ESP8266) || defined(ESP32) @@ -1852,6 +1852,33 @@ void WiFiManager::setTitle(String title){ * @since $dev * @param uint8_t menu[] array of menu ids */ +// Menu tokens (used by setMenu and handlers) - defined here, declared in WiFiManagerServer.h +const char _wifi_token[] PROGMEM = "wifi"; +const char _wifinoscan_token[] PROGMEM = "wifinoscan"; +const char _info_token[] PROGMEM = "info"; +const char _param_token[] PROGMEM = "param"; +const char _close_token[] PROGMEM = "close"; +const char _restart_token[] PROGMEM = "restart"; +const char _exit_token[] PROGMEM = "exit"; +const char _erase_token[] PROGMEM = "erase"; +const char _update_token[] PROGMEM = "update"; +const char _sep_token[] PROGMEM = "sep"; +const char _custom_token[] PROGMEM = "custom"; +PGM_P _menutokens[] PROGMEM = { + _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)); + void WiFiManager::setMenu(const char * menu[], uint8_t size){ #ifdef WM_DEBUG_LEVEL // DEBUG_WM(WM_DEBUG_DEV,"setmenu array"); @@ -1959,6 +1986,15 @@ String WiFiManager::getDefaultAPName(){ return _wifissidprefix + "_" + hostString; } +/** + * setWiFiSSIDPrefix + * Set the prefix for default AP name (e.g., "ESP" becomes "ESP_XXXXXX") + * @param String prefix, prefix for auto-generated AP name + */ +void WiFiManager::setWiFiSSIDPrefix(String prefix){ + _wifissidprefix = prefix; +} + /** * setCountry * @since $dev @@ -2049,7 +2085,7 @@ void WiFiManager::debugSoftAPConfig(){ #ifdef WM_DEBUG_LEVEL DEBUG_WM(F("SoftAP Configuration")); - DEBUG_WM(FPSTR(D_HR)); + 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); @@ -2063,7 +2099,7 @@ void WiFiManager::debugSoftAPConfig(){ DEBUG_WM(F("country: "),(String)country.cc); #endif DEBUG_WM(F("beacon_interval: "),(String)config.beacon_interval + "(ms)"); - DEBUG_WM(FPSTR(D_HR)); + DEBUG_WM(F("--------------------")); #endif } @@ -2098,45 +2134,25 @@ void WiFiManager::debugPlatformInfo(){ #endif } +// Utility function wrappers - delegate to WiFiManagerUtils namespace + int WiFiManager::getRSSIasQuality(int RSSI) { - int quality = 0; - - if (RSSI <= -100) { - quality = 0; - } else if (RSSI >= -50) { - quality = 100; - } else { - quality = 2 * (RSSI + 100); - } - return quality; + return WiFiManagerUtils::rssiToQuality(RSSI); } -/** Is this an IP? */ boolean WiFiManager::isIp(String str) { - for (size_t i = 0; i < str.length(); i++) { - int c = str.charAt(i); - if (c != '.' && (c < '0' || c > '9')) { - return false; - } - } - return true; + return WiFiManagerUtils::isValidIP(str); } -/** IP to String? */ String WiFiManager::toStringIp(IPAddress ip) { - String res = ""; - for (int i = 0; i < 3; i++) { - res += String((ip >> (8 * i)) & 0xFF) + "."; - } - res += String(((ip >> 8 * 3)) & 0xFF); - return res; + return WiFiManagerUtils::ipToString(ip); } boolean WiFiManager::validApPassword(){ // check that ap password is valid, return false if (_apPassword == NULL) _apPassword = ""; if (_apPassword != "") { - if (_apPassword.length() < 8 || _apPassword.length() > 63) { + if (!WiFiManagerUtils::isValidAPPassword(_apPassword)) { #ifdef WM_DEBUG_LEVEL DEBUG_WM(F("AccessPoint set password is INVALID or <8 chars")); #endif @@ -2151,55 +2167,37 @@ boolean WiFiManager::validApPassword(){ return true; } -/** - * encode htmlentities - * @since $dev - * @param string str string to replace entities - * @return string encoded string - */ String WiFiManager::htmlEntities(String str, bool whitespace) { - str.replace("&","&"); - str.replace("<","<"); - str.replace(">",">"); - str.replace("'","'"); - if(whitespace) str.replace(" "," "); - // str.replace("-","–"); - // str.replace("\"","""); - // str.replace("/": "/"); - // str.replace("`": "`"); - // str.replace("=": "="); -return str; + return WiFiManagerUtils::htmlEntities(str, whitespace); } -/** - * [getWLStatusString description] - * @access public - * @param {[type]} uint8_t status [description] - * @return {[type]} [description] - */ String WiFiManager::getWLStatusString(uint8_t status){ - if(status <= 7) return WIFI_STA_STATUS[status]; - return FPSTR(S_NA); + return WiFiManagerUtils::getStatusString(status); } String WiFiManager::getWLStatusString(){ - uint8_t status = WiFi.status(); - if(status <= 7) return WIFI_STA_STATUS[status]; - return FPSTR(S_NA); + return WiFiManagerUtils::getStatusString(WiFi.status()); } String WiFiManager::encryptionTypeStr(uint8_t authmode) { -#ifdef WM_DEBUG_LEVEL - // DEBUG_WM("enc_tye: ",authmode); - #endif - return AUTH_MODE_NAMES[authmode]; + return WiFiManagerUtils::getEncryptionString(authmode); } String WiFiManager::getModeString(uint8_t mode){ - if(mode <= 3) return WIFI_MODES[mode]; - return FPSTR(S_NA); + return WiFiManagerUtils::getModeString(mode); } +// Country configurations (used by WiFiSetCountry) +#ifdef ESP32 +const wifi_country_t WM_COUNTRY_US{"US",1,11,CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER,WIFI_COUNTRY_POLICY_AUTO}; +const wifi_country_t WM_COUNTRY_CN{"CN",1,13,CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER,WIFI_COUNTRY_POLICY_AUTO}; +const wifi_country_t WM_COUNTRY_JP{"JP",1,14,CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER,WIFI_COUNTRY_POLICY_AUTO}; +#elif defined(ESP8266) && !defined(WM_NOCOUNTRY) +const wifi_country_t WM_COUNTRY_US{"US",1,11,WIFI_COUNTRY_POLICY_AUTO}; +const wifi_country_t WM_COUNTRY_CN{"CN",1,13,WIFI_COUNTRY_POLICY_AUTO}; +const wifi_country_t WM_COUNTRY_JP{"JP",1,14,WIFI_COUNTRY_POLICY_AUTO}; +#endif + bool WiFiManager::WiFiSetCountry(){ if(_wificountry == "") return false; // skip not set @@ -2207,16 +2205,6 @@ bool WiFiManager::WiFiSetCountry(){ DEBUG_WM(WM_DEBUG_VERBOSE,F("WiFiSetCountry to"),_wificountry); #endif -/* - * @return - * - ESP_OK: succeed - * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init - * - ESP_ERR_WIFI_IF: invalid interface - * - ESP_ERR_WIFI_ARG: invalid argument - * - others: refer to error codes in esp_err.h - */ - - // @todo move these definitions, and out of cpp `esp_wifi_set_country(&WM_COUNTRY_US)` bool ret = true; // ret = esp_wifi_set_bandwidth(WIFI_IF_AP,WIFI_BW_HT20); // WIFI_BW_HT40 #ifdef ESP32 diff --git a/lib/WiFiManager/src/WiFiManagerHandlers.cpp b/lib/WiFiManager/src/WiFiManagerHandlers.cpp index ed7bf7a..024b5b2 100644 --- a/lib/WiFiManager/src/WiFiManagerHandlers.cpp +++ b/lib/WiFiManager/src/WiFiManagerHandlers.cpp @@ -9,7 +9,10 @@ */ #include "WiFiManagerHandlers.h" -#include "WiFiManager.h" +#include "WiFiManagerServer.h" // Need menu tokens and routes +#include "templates/HTML.h" +#include "templates/CSS.h" +#include "templates/JS.h" #if defined(ESP8266) || defined(ESP32) @@ -20,21 +23,24 @@ WiFiManagerHandlers::WiFiManagerHandlers(WiFiManager* wm) : _wm(wm) { String WiFiManagerHandlers::getHTTPHead(String title, String classes){ String page; - page += FPSTR(HTTP_HEAD_START); - page.replace(FPSTR(T_v), title); - page += FPSTR(HTTP_SCRIPT); - page += FPSTR(HTTP_STYLE); + // Use template for HTML head start + page += FPSTR(HTML_HEAD_START); + page += title; + page += FPSTR(HTML_TITLE_END); + page += FPSTR(JS_SCRIPT); + page += FPSTR(CSS_STYLE); page += _wm->_customHeadElement; - String p = FPSTR(HTTP_HEAD_END); + // Build body tag with classes using template + page += FPSTR(HTML_HEAD_END_START); if (_wm->_bodyClass != "") { if (classes != "") { classes += " "; // add spacing, if necessary } classes += _wm->_bodyClass; // add class str } - p.replace(FPSTR(T_c), classes); - page += p; + page += classes; + page += FPSTR(HTML_HEAD_END_WRAP); if (_wm->_customBodyHeader) { page += _wm->_customBodyHeader; @@ -44,7 +50,7 @@ String WiFiManagerHandlers::getHTTPHead(String title, String classes){ } String WiFiManagerHandlers::getHTTPEnd() { - String end = FPSTR(HTTP_END); + String end = FPSTR(HTML_END); if (_wm->_customBodyFooter) { end = String(_wm->_customBodyFooter) + end; @@ -62,7 +68,7 @@ String WiFiManagerHandlers::getMenuOut(){ page += _wm->_customMenuHTML; continue; } - page += HTTP_PORTAL_MENU[menuId]; + page += HTML_PORTAL_MENU[menuId]; delay(0); } @@ -82,7 +88,7 @@ String WiFiManagerHandlers::getScanItemOut(){ if(_wm->_scanInProgress){ page += F("Scanning for networks...

"); } else { - page += FPSTR(S_nonetworks); // @token nonetworks + page += F("No networks found. Refresh to scan again."); page += F("

"); } } @@ -122,21 +128,9 @@ String WiFiManagerHandlers::getScanItemOut(){ } } - // token precheck, to speed up replacements on large ap lists - String HTTP_ITEM_STR = FPSTR(HTTP_ITEM); - - // toggle icons with percentage - HTTP_ITEM_STR.replace("{qp}", FPSTR(HTTP_ITEM_QP)); - HTTP_ITEM_STR.replace("{h}",_wm->_scanDispOptions ? "" : "h"); - HTTP_ITEM_STR.replace("{qi}", FPSTR(HTTP_ITEM_QI)); - HTTP_ITEM_STR.replace("{h}",_wm->_scanDispOptions ? "h" : ""); - - // set token precheck flags - bool tok_r = HTTP_ITEM_STR.indexOf(FPSTR(T_r)) > 0; - bool tok_R = HTTP_ITEM_STR.indexOf(FPSTR(T_R)) > 0; - bool tok_e = HTTP_ITEM_STR.indexOf(FPSTR(T_e)) > 0; - bool tok_q = HTTP_ITEM_STR.indexOf(FPSTR(T_q)) > 0; - bool tok_i = HTTP_ITEM_STR.indexOf(FPSTR(T_i)) > 0; + // Build network items directly without tokens + String hiddenClass = _wm->_scanDispOptions ? "" : "h"; + String visibleClass = _wm->_scanDispOptions ? "h" : ""; //display networks in page for (int i = 0; i < n; i++) { @@ -150,27 +144,45 @@ String WiFiManagerHandlers::getScanItemOut(){ uint8_t enc_type = WiFi.encryptionType(indices[i]); if (_wm->_minimumQuality == -1 || _wm->_minimumQuality < rssiperc) { - String item = HTTP_ITEM_STR; if(WiFi.SSID(indices[i]) == ""){ continue; // No idea why I am seeing these, lets just skip them for now } - item.replace(FPSTR(T_V), _wm->htmlEntities(WiFi.SSID(indices[i]))); // ssid no encoding - item.replace(FPSTR(T_v), _wm->htmlEntities(WiFi.SSID(indices[i]),true)); // ssid no encoding - if(tok_e) item.replace(FPSTR(T_e), _wm->encryptionTypeStr(enc_type)); - if(tok_r) item.replace(FPSTR(T_r), (String)rssiperc); // rssi percentage 0-100 - if(tok_R) item.replace(FPSTR(T_R), (String)WiFi.RSSI(indices[i])); // rssi db - if(tok_q) item.replace(FPSTR(T_q), (String)int(round(map(rssiperc,0,100,1,4)))); //quality icon 1-4 - if(tok_i){ - if (enc_type != WM_WIFIOPEN) { - item.replace(FPSTR(T_i), F("l")); - } else { - item.replace(FPSTR(T_i), ""); - } - } + + String ssid_encoded = _wm->htmlEntities(WiFi.SSID(indices[i])); + String ssid_display = _wm->htmlEntities(WiFi.SSID(indices[i]), true); + int quality = int(round(map(rssiperc,0,100,1,4))); + String lockIcon = (enc_type != WM_WIFIOPEN) ? "l" : ""; + + // Build item HTML directly + page += F("
"); + page += ssid_display; + page += F(""); + + // Add RSSI quality icon + page += F(""); + + // Add RSSI percentage (if showing percentage) + page += F("
"); + page += String(rssiperc); + page += F("%
"); + #ifdef WM_DEBUG_LEVEL - _wm->DEBUG_WM(WM_DEBUG_DEV,item); + _wm->DEBUG_WM(WM_DEBUG_DEV, F("Added network item")); #endif - page += item; delay(0); } else { #ifdef WM_DEBUG_LEVEL @@ -179,22 +191,25 @@ String WiFiManagerHandlers::getScanItemOut(){ } } - page += FPSTR(HTTP_BR); + page += FPSTR(HTML_BR); } return page; } String WiFiManagerHandlers::getIpForm(String id, String title, String value){ - String item = FPSTR(HTTP_FORM_LABEL); - item += FPSTR(HTTP_FORM_PARAM); - item.replace(FPSTR(T_i), id); - item.replace(FPSTR(T_n), id); - item.replace(FPSTR(T_p), FPSTR(T_t)); - item.replace(FPSTR(T_t), title); - item.replace(FPSTR(T_l), F("15")); - item.replace(FPSTR(T_v), value); - item.replace(FPSTR(T_c), ""); + // Build IP form field directly without tokens + String item = F("
"); return item; } @@ -204,17 +219,17 @@ String WiFiManagerHandlers::getStaticOut(){ #ifdef WM_DEBUG_LEVEL _wm->DEBUG_WM(WM_DEBUG_DEV,F("_staShowStaticFields")); #endif - page += FPSTR(HTTP_FORM_STATIC_HEAD); - page += getIpForm(FPSTR(S_ip),FPSTR(S_staticip),(_wm->_sta_static_ip ? _wm->_sta_static_ip.toString() : "")); - page += getIpForm(FPSTR(S_gw),FPSTR(S_staticgw),(_wm->_sta_static_gw ? _wm->_sta_static_gw.toString() : "")); - page += getIpForm(FPSTR(S_sn),FPSTR(S_subnet),(_wm->_sta_static_sn ? _wm->_sta_static_sn.toString() : "")); + page += FPSTR(HTML_FORM_STATIC_HEAD); + page += getIpForm(FPSTR(S_ip),F("Static IP"),(_wm->_sta_static_ip ? _wm->_sta_static_ip.toString() : "")); + page += getIpForm(FPSTR(S_gw),F("Static gateway"),(_wm->_sta_static_gw ? _wm->_sta_static_gw.toString() : "")); + page += getIpForm(FPSTR(S_sn),F("Subnet"),(_wm->_sta_static_sn ? _wm->_sta_static_sn.toString() : "")); } if((_wm->_staShowDns || _wm->_sta_static_dns) && _wm->_staShowDns>=0){ - page += getIpForm(FPSTR(S_dns),FPSTR(S_staticdns),(_wm->_sta_static_dns ? _wm->_sta_static_dns.toString() : "")); + page += getIpForm(FPSTR(S_dns),F("Static DNS"),(_wm->_sta_static_dns ? _wm->_sta_static_dns.toString() : "")); } - if(page!="") page += FPSTR(HTTP_BR); + if(page!="") page += FPSTR(HTML_BR); return page; } @@ -228,17 +243,6 @@ String WiFiManagerHandlers::getParamOut(){ if(_wm->_paramsCount > 0){ - String HTTP_PARAM_temp = FPSTR(HTTP_FORM_LABEL); - HTTP_PARAM_temp += FPSTR(HTTP_FORM_PARAM); - bool tok_I = HTTP_PARAM_temp.indexOf(FPSTR(T_I)) > 0; - bool tok_i = HTTP_PARAM_temp.indexOf(FPSTR(T_i)) > 0; - bool tok_n = HTTP_PARAM_temp.indexOf(FPSTR(T_n)) > 0; - bool tok_p = HTTP_PARAM_temp.indexOf(FPSTR(T_p)) > 0; - bool tok_t = HTTP_PARAM_temp.indexOf(FPSTR(T_t)) > 0; - bool tok_l = HTTP_PARAM_temp.indexOf(FPSTR(T_l)) > 0; - bool tok_v = HTTP_PARAM_temp.indexOf(FPSTR(T_v)) > 0; - bool tok_c = HTTP_PARAM_temp.indexOf(FPSTR(T_c)) > 0; - char valLength[5]; for (int i = 0; i < _wm->_paramsCount; i++) { @@ -252,32 +256,79 @@ String WiFiManagerHandlers::getParamOut(){ // add the extra parameters to the form for (int i = 0; i < _wm->_paramsCount; i++) { - String pitem; - switch (_wm->_params[i]->getLabelPlacement()) { - case WFM_LABEL_BEFORE: - pitem = FPSTR(HTTP_FORM_LABEL); - pitem += FPSTR(HTTP_FORM_PARAM); - break; - case WFM_LABEL_AFTER: - pitem = FPSTR(HTTP_FORM_PARAM); - pitem += FPSTR(HTTP_FORM_LABEL); - break; - default: - pitem = FPSTR(HTTP_FORM_PARAM); - break; - } - + String pitem; + if (_wm->_params[i]->getID() != NULL) { - if(tok_I)pitem.replace(FPSTR(T_I), (String)FPSTR(S_parampre)+(String)i); - if(tok_i)pitem.replace(FPSTR(T_i), _wm->_params[i]->getID()); - if(tok_n)pitem.replace(FPSTR(T_n), _wm->_params[i]->getID()); - if(tok_p)pitem.replace(FPSTR(T_p), FPSTR(T_t)); - if(tok_t)pitem.replace(FPSTR(T_t), _wm->_params[i]->getLabel()); + String paramId = _wm->_params[i]->getID(); + String paramLabel = _wm->_params[i]->getLabel(); + String paramValue = _wm->_params[i]->getValue(); + String customHTML = _wm->_params[i]->getCustomHTML(); snprintf(valLength, 5, "%d", _wm->_params[i]->getValueLength()); - if(tok_l)pitem.replace(FPSTR(T_l), valLength); - if(tok_v)pitem.replace(FPSTR(T_v), _wm->_params[i]->getValue()); - if(tok_c)pitem.replace(FPSTR(T_c), _wm->_params[i]->getCustomHTML()); + + // Build parameter HTML directly based on label placement + switch (_wm->_params[i]->getLabelPlacement()) { + case WFM_LABEL_BEFORE: + // Label before input + pitem = F("
0) { + pitem += F(" "); + pitem += customHTML; + } + pitem += F(">\n"); + break; + case WFM_LABEL_AFTER: + // Label after input + pitem = F("
0) { + pitem += F(" "); + pitem += customHTML; + } + pitem += F(">\n"); + break; + default: + // WFM_NO_LABEL - no label + pitem = F("
0) { + pitem += F(" "); + pitem += customHTML; + } + pitem += F(">\n"); + break; + } } else { + // Custom HTML only (no ID) pitem = _wm->_params[i]->getCustomHTML(); } @@ -291,216 +342,259 @@ String WiFiManagerHandlers::getParamOut(){ String WiFiManagerHandlers::getInfoData(String id){ String p; if(id==F("esphead")){ - p = FPSTR(HTTP_INFO_esphead); #ifdef ESP32 - p.replace(FPSTR(T_1), (String)ESP.getChipModel()); + p = F("

esp32

"); + #else + p = F("

esp8266

"); #endif } else if(id==F("wifihead")){ - p = FPSTR(HTTP_INFO_wifihead); - p.replace(FPSTR(T_1),_wm->getModeString(WiFi.getMode())); + p = F("

WiFi

"); } else if(id==F("uptime")){ - p = FPSTR(HTTP_INFO_uptime); - p.replace(FPSTR(T_1),(String)(millis() / 1000 / 60)); - p.replace(FPSTR(T_2),(String)((millis() / 1000) % 60)); + p = F("
Uptime
"); + p += String(millis() / 1000 / 60); + p += F(" mins "); + p += String((millis() / 1000) % 60); + p += F(" secs
"); } else if(id==F("chipid")){ - p = FPSTR(HTTP_INFO_chipid); + p = F("
Chip ID
"); #ifdef ESP8266 - p.replace(FPSTR(T_1),String(ESP.getChipId(),HEX)); + p += String(ESP.getChipId(),HEX); #elif defined(ESP32) - p.replace(FPSTR(T_1),String((uint32_t)ESP.getEfuseMac(),HEX)); + p += String((uint32_t)ESP.getEfuseMac(),HEX); #endif + p += F("
"); } #ifdef ESP32 else if(id==F("chiprev")){ - p = FPSTR(HTTP_INFO_chiprev); + p = F("
Chip rev
"); String rev = (String)ESP.getChipRevision(); #ifdef _SOC_EFUSE_REG_H_ String revb = (String)(REG_READ(EFUSE_BLK0_RDATA3_REG) >> (EFUSE_RD_CHIP_VER_RESERVE_S)&&EFUSE_RD_CHIP_VER_RESERVE_V); - p.replace(FPSTR(T_1),rev+"
"+revb); + p += rev; + p += F("
"); + p += revb; #else - p.replace(FPSTR(T_1),rev); + p += rev; #endif + p += F("
"); } #endif #ifdef ESP8266 else if(id==F("fchipid")){ - p = FPSTR(HTTP_INFO_fchipid); - p.replace(FPSTR(T_1),(String)ESP.getFlashChipId()); + p = F("
Flash chip ID
"); + p += String(ESP.getFlashChipId()); + p += F("
"); } #endif else if(id==F("idesize")){ - p = FPSTR(HTTP_INFO_idesize); - p.replace(FPSTR(T_1),(String)ESP.getFlashChipSize()); + p = F("
Flash size
"); + p += String(ESP.getFlashChipSize()); + p += F(" bytes
"); } else if(id==F("flashsize")){ #ifdef ESP8266 - p = FPSTR(HTTP_INFO_flashsize); - p.replace(FPSTR(T_1),(String)ESP.getFlashChipRealSize()); + p = F("
Real flash size
"); + p += String(ESP.getFlashChipRealSize()); + p += F(" bytes
"); #elif defined ESP32 - p = FPSTR(HTTP_INFO_psrsize); - p.replace(FPSTR(T_1),(String)ESP.getPsramSize()); + p = F("
PSRAM Size
"); + p += String(ESP.getPsramSize()); + p += F(" bytes
"); #endif } else if(id==F("corever")){ #ifdef ESP8266 - p = FPSTR(HTTP_INFO_corever); - p.replace(FPSTR(T_1),(String)ESP.getCoreVersion()); + p = F("
Core version
"); + p += String(ESP.getCoreVersion()); + p += F("
"); #endif } #ifdef ESP8266 else if(id==F("bootver")){ - p = FPSTR(HTTP_INFO_bootver); - p.replace(FPSTR(T_1),(String)system_get_boot_version()); + p = F("
Boot version
"); + p += String(system_get_boot_version()); + p += F("
"); } #endif else if(id==F("cpufreq")){ - p = FPSTR(HTTP_INFO_cpufreq); - p.replace(FPSTR(T_1),(String)ESP.getCpuFreqMHz()); + p = F("
CPU frequency
"); + p += String(ESP.getCpuFreqMHz()); + p += F("MHz
"); } else if(id==F("freeheap")){ - p = FPSTR(HTTP_INFO_freeheap); - p.replace(FPSTR(T_1),(String)ESP.getFreeHeap()); + p = F("
Memory - Free heap
"); + p += String(ESP.getFreeHeap()); + p += F(" bytes available
"); } else if(id==F("memsketch")){ - p = FPSTR(HTTP_INFO_memsketch); - p.replace(FPSTR(T_1),(String)(ESP.getSketchSize())); - p.replace(FPSTR(T_2),(String)(ESP.getSketchSize()+ESP.getFreeSketchSpace())); + p = F("
Memory - Sketch size
Used / Total bytes
"); + p += String(ESP.getSketchSize()); + p += F(" / "); + p += String(ESP.getSketchSize()+ESP.getFreeSketchSpace()); + p += F("
"); } else if(id==F("memsmeter")){ - p = FPSTR(HTTP_INFO_memsmeter); - p.replace(FPSTR(T_1),(String)(ESP.getSketchSize())); - p.replace(FPSTR(T_2),(String)(ESP.getSketchSize()+ESP.getFreeSketchSpace())); + p = F("
"); } else if(id==F("lastreset")){ #ifdef ESP8266 - p = FPSTR(HTTP_INFO_lastreset); - p.replace(FPSTR(T_1),(String)ESP.getResetReason()); + p = F("
Last reset reason
"); + p += String(ESP.getResetReason()); + p += F("
"); #elif defined(ESP32) && defined(_ROM_RTC_H_) - p = FPSTR(HTTP_INFO_lastreset); + p = F("
Last reset reason
CPU0: "); + String reasons[2]; for(int i=0;i<2;i++){ int reason = rtc_get_reset_reason(i); - String tok = (String)T_ss+(String)(i+1)+(String)T_es; switch (reason) { - case 1 : p.replace(tok,F("Vbat power on reset"));break; - case 3 : p.replace(tok,F("Software reset digital core"));break; - case 4 : p.replace(tok,F("Legacy watch dog reset digital core"));break; - case 5 : p.replace(tok,F("Deep Sleep reset digital core"));break; - case 6 : p.replace(tok,F("Reset by SLC module, reset digital core"));break; - case 7 : p.replace(tok,F("Timer Group0 Watch dog reset digital core"));break; - case 8 : p.replace(tok,F("Timer Group1 Watch dog reset digital core"));break; - case 9 : p.replace(tok,F("RTC Watch dog Reset digital core"));break; - case 10 : p.replace(tok,F("Instrusion tested to reset CPU"));break; - case 11 : p.replace(tok,F("Time Group reset CPU"));break; - case 12 : p.replace(tok,F("Software reset CPU"));break; - case 13 : p.replace(tok,F("RTC Watch dog Reset CPU"));break; - case 14 : p.replace(tok,F("for APP CPU, reseted by PRO CPU"));break; - case 15 : p.replace(tok,F("Reset when the vdd voltage is not stable"));break; - case 16 : p.replace(tok,F("RTC Watch dog reset digital core and rtc module"));break; - default : p.replace(tok,F("NO_MEAN")); + case 1 : reasons[i] = F("Vbat power on reset");break; + case 3 : reasons[i] = F("Software reset digital core");break; + case 4 : reasons[i] = F("Legacy watch dog reset digital core");break; + case 5 : reasons[i] = F("Deep Sleep reset digital core");break; + case 6 : reasons[i] = F("Reset by SLC module, reset digital core");break; + case 7 : reasons[i] = F("Timer Group0 Watch dog reset digital core");break; + case 8 : reasons[i] = F("Timer Group1 Watch dog reset digital core");break; + case 9 : reasons[i] = F("RTC Watch dog Reset digital core");break; + case 10 : reasons[i] = F("Instrusion tested to reset CPU");break; + case 11 : reasons[i] = F("Time Group reset CPU");break; + case 12 : reasons[i] = F("Software reset CPU");break; + case 13 : reasons[i] = F("RTC Watch dog Reset CPU");break; + case 14 : reasons[i] = F("for APP CPU, reseted by PRO CPU");break; + case 15 : reasons[i] = F("Reset when the vdd voltage is not stable");break; + case 16 : reasons[i] = F("RTC Watch dog reset digital core and rtc module");break; + default : reasons[i] = F("NO_MEAN"); } } + p += reasons[0]; + p += F("
CPU1: "); + p += reasons[1]; + p += F("
"); #endif } else if(id==F("apip")){ - p = FPSTR(HTTP_INFO_apip); - p.replace(FPSTR(T_1),WiFi.softAPIP().toString()); + p = F("
Access point IP
"); + p += WiFi.softAPIP().toString(); + p += F("
"); } else if(id==F("apmac")){ - p = FPSTR(HTTP_INFO_apmac); - p.replace(FPSTR(T_1),(String)WiFi.softAPmacAddress()); + p = F("
Access point MAC
"); + p += WiFi.softAPmacAddress(); + p += F("
"); } #ifdef ESP32 else if(id==F("aphost")){ - p = FPSTR(HTTP_INFO_aphost); - p.replace(FPSTR(T_1),WiFi.softAPgetHostname()); + p = F("
Access point hostname
"); + p += WiFi.softAPgetHostname(); + p += F("
"); } #endif #ifndef WM_NOSOFTAPSSID #ifdef ESP8266 else if(id==F("apssid")){ - p = FPSTR(HTTP_INFO_apssid); - p.replace(FPSTR(T_1),_wm->htmlEntities(WiFi.softAPSSID())); + p = F("
Access point SSID
"); + p += _wm->htmlEntities(WiFi.softAPSSID()); + p += F("
"); } #endif #endif else if(id==F("apbssid")){ - p = FPSTR(HTTP_INFO_apbssid); - p.replace(FPSTR(T_1),(String)WiFi.BSSIDstr()); + p = F("
BSSID
"); + p += WiFi.BSSIDstr(); + p += F("
"); } else if(id==F("stassid")){ - p = FPSTR(HTTP_INFO_stassid); - p.replace(FPSTR(T_1),_wm->htmlEntities((String)_wm->WiFi_SSID())); + p = F("
Station SSID
"); + p += _wm->htmlEntities((String)_wm->WiFi_SSID()); + p += F("
"); } else if(id==F("staip")){ - p = FPSTR(HTTP_INFO_staip); - p.replace(FPSTR(T_1),WiFi.localIP().toString()); + p = F("
Station IP
"); + p += WiFi.localIP().toString(); + p += F("
"); } else if(id==F("stagw")){ - p = FPSTR(HTTP_INFO_stagw); - p.replace(FPSTR(T_1),WiFi.gatewayIP().toString()); + p = F("
Station gateway
"); + p += WiFi.gatewayIP().toString(); + p += F("
"); } else if(id==F("stasub")){ - p = FPSTR(HTTP_INFO_stasub); - p.replace(FPSTR(T_1),WiFi.subnetMask().toString()); + p = F("
Station subnet
"); + p += WiFi.subnetMask().toString(); + p += F("
"); } else if(id==F("dnss")){ - p = FPSTR(HTTP_INFO_dnss); - p.replace(FPSTR(T_1),WiFi.dnsIP().toString()); + p = F("
DNS Server
"); + p += WiFi.dnsIP().toString(); + p += F("
"); } else if(id==F("host")){ - p = FPSTR(HTTP_INFO_host); + p = F("
Hostname
"); #ifdef ESP32 - p.replace(FPSTR(T_1),WiFi.getHostname()); + p += WiFi.getHostname(); #else - p.replace(FPSTR(T_1),WiFi.hostname()); + p += WiFi.hostname(); #endif + p += F("
"); } else if(id==F("stamac")){ - p = FPSTR(HTTP_INFO_stamac); - p.replace(FPSTR(T_1),WiFi.macAddress()); + p = F("
Station MAC
"); + p += WiFi.macAddress(); + p += F("
"); } else if(id==F("conx")){ - p = FPSTR(HTTP_INFO_conx); - p.replace(FPSTR(T_1),WiFi.isConnected() ? FPSTR(S_y) : FPSTR(S_n)); + p = F("
Connected
"); + p += (WiFi.isConnected() ? F("Yes") : F("No")); + p += F("
"); } #ifdef ESP8266 else if(id==F("autoconx")){ - p = FPSTR(HTTP_INFO_autoconx); - p.replace(FPSTR(T_1),WiFi.getAutoConnect() ? FPSTR(S_enable) : FPSTR(S_disable)); + p = F("
Autoconnect
"); + p += (WiFi.getAutoConnect() ? F("Enabled") : F("Disabled")); + p += F("
"); } #endif #if defined(ESP32) && !defined(WM_NOTEMP) else if(id==F("temp")){ - p = FPSTR(HTTP_INFO_temp); - p.replace(FPSTR(T_1),(String)temperatureRead()); - p.replace(FPSTR(T_2),(String)((temperatureRead()+32)*1.8f)); + p = F("
Temperature
"); + p += String(temperatureRead()); + p += F(" C° / "); + p += String((temperatureRead()+32)*1.8f); + p += F(" F°
"); } #endif else if(id==F("aboutver")){ - p = FPSTR(HTTP_INFO_aboutver); - p.replace(FPSTR(T_1),FPSTR(WM_VERSION_STR)); + p = F("
WiFiManager
"); + p += FPSTR(WM_VERSION_STR); + p += F("
"); } else if(id==F("aboutarduinover")){ #ifdef VER_ARDUINO_STR - p = FPSTR(HTTP_INFO_aboutarduino); - p.replace(FPSTR(T_1),String(VER_ARDUINO_STR)); + p = F("
Arduino
"); + p += String(VER_ARDUINO_STR); + p += F("
"); #endif } else if(id==F("aboutsdkver")){ - p = FPSTR(HTTP_INFO_sdkver); + p = F("
SDK version
"); #ifdef ESP32 - p.replace(FPSTR(T_1),(String)esp_get_idf_version()); + p += String(esp_get_idf_version()); #else - p.replace(FPSTR(T_1),(String)system_get_sdk_version()); + p += String(system_get_sdk_version()); #endif + p += F("
"); } else if(id==F("aboutdate")){ - p = FPSTR(HTTP_INFO_aboutdate); - p.replace(FPSTR(T_1),String(__DATE__ " " __TIME__)); + p = F("
Build date
"); + p += String(__DATE__ " " __TIME__); + p += F("
"); } return p; } @@ -511,37 +605,42 @@ void WiFiManagerHandlers::reportStatus(String &page){ String str; if (_wm->WiFi_SSID() != ""){ if (WiFi.status()==WL_CONNECTED){ - str = FPSTR(HTTP_STATUS_ON); - str.replace(FPSTR(T_i),WiFi.localIP().toString()); - str.replace(FPSTR(T_v),_wm->htmlEntities(_wm->WiFi_SSID())); + // Build connected status HTML directly + str = F("
Connected to "); + str += _wm->htmlEntities(_wm->WiFi_SSID()); + str += F("
with IP "); + str += WiFi.localIP().toString(); + str += F("
"); } else { - str = FPSTR(HTTP_STATUS_OFF); - str.replace(FPSTR(T_v),_wm->htmlEntities(_wm->WiFi_SSID())); + // Build disconnected status HTML directly + String ssidEncoded = _wm->htmlEntities(_wm->WiFi_SSID()); + String statusClass = "D"; + String statusMsg = ""; + if(_wm->_lastconxresult == _wm->WL_STATION_WRONG_PASSWORD){ - str.replace(FPSTR(T_c),"D"); - str.replace(FPSTR(T_r),FPSTR(HTTP_STATUS_OFFPW)); + statusMsg = FPSTR(HTML_STATUS_OFFPW); } else if(_wm->_lastconxresult == WL_NO_SSID_AVAIL){ - str.replace(FPSTR(T_c),"D"); - str.replace(FPSTR(T_r),FPSTR(HTTP_STATUS_OFFNOAP)); + statusMsg = FPSTR(HTML_STATUS_OFFNOAP); } - else if(_wm->_lastconxresult == WL_CONNECT_FAILED){ - str.replace(FPSTR(T_c),"D"); - str.replace(FPSTR(T_r),FPSTR(HTTP_STATUS_OFFFAIL)); - } - else if(_wm->_lastconxresult == WL_CONNECTION_LOST){ - str.replace(FPSTR(T_c),"D"); - str.replace(FPSTR(T_r),FPSTR(HTTP_STATUS_OFFFAIL)); + else if(_wm->_lastconxresult == WL_CONNECT_FAILED || _wm->_lastconxresult == WL_CONNECTION_LOST){ + statusMsg = FPSTR(HTML_STATUS_OFFFAIL); } else{ - str.replace(FPSTR(T_c),""); - str.replace(FPSTR(T_r),""); - } + statusClass = ""; + } + + str = F("
Not connected to "); + str += ssidEncoded; + str += statusMsg; + str += F("
"); } } else { - str = FPSTR(HTTP_STATUS_NONE); + str = FPSTR(HTML_STATUS_NONE); } page += str; } @@ -610,11 +709,13 @@ void WiFiManagerHandlers::handleRoot(AsyncWebServerRequest *request) { if (captivePortal(request)) return; handleRequest(request); String page = getHTTPHead(_wm->_title, FPSTR(C_root)); - String str = FPSTR(HTTP_ROOT_MAIN); - str.replace(FPSTR(T_t), _wm->_title); - str.replace(FPSTR(T_v), _wm->configPortalActive ? _wm->_apName : (_wm->getWiFiHostname() + " - " + WiFi.localIP().toString())); - page += str; - page += FPSTR(HTTP_PORTAL_OPTIONS); + // Build root main HTML directly without tokens + page += F("

"); + page += _wm->_title; + page += F("

"); + page += (_wm->configPortalActive ? _wm->_apName : (_wm->getWiFiHostname() + " - " + WiFi.localIP().toString())); + page += F("

"); + page += FPSTR(HTML_PORTAL_OPTIONS); page += getMenuOut(); reportStatus(page); page += getHTTPEnd(); @@ -635,7 +736,7 @@ void WiFiManagerHandlers::handleWifi(AsyncWebServerRequest *request, boolean sca return; } handleRequest(request); - String page = getHTTPHead(FPSTR(S_titlewifi), FPSTR(C_wifi)); + String page = getHTTPHead(F("Config ESP"), FPSTR(C_wifi)); if (scan) { bool forceRefresh = false; if (request->hasParam("refresh")) { @@ -654,36 +755,34 @@ void WiFiManagerHandlers::handleWifi(AsyncWebServerRequest *request, boolean sca } } } - String pitem = ""; - - pitem = FPSTR(HTTP_FORM_START); - pitem.replace(FPSTR(T_v), F("wifisave")); - page += pitem; - - pitem = FPSTR(HTTP_FORM_WIFI); - pitem.replace(FPSTR(T_v), _wm->WiFi_SSID()); - + // Build WiFi form directly without tokens + page += F("
"); + + String ssidPlaceholder = _wm->WiFi_SSID(); + String passwordPlaceholder = ""; + if(_wm->_showPassword){ - pitem.replace(FPSTR(T_p), _wm->WiFi_psk()); + passwordPlaceholder = _wm->WiFi_psk(); } else if(_wm->WiFi_psk() != ""){ - pitem.replace(FPSTR(T_p), FPSTR(S_passph)); + passwordPlaceholder = F("********"); } - else { - pitem.replace(FPSTR(T_p), ""); - } - - page += pitem; + + page += F("

"); page += getStaticOut(); - page += FPSTR(HTTP_FORM_WIFI_END); + page += FPSTR(HTML_FORM_WIFI_END); if(_wm->_paramsInWifi && _wm->_paramsCount > 0){ - page += FPSTR(HTTP_FORM_PARAM_HEAD); + page += FPSTR(HTML_FORM_PARAM_HEAD); page += getParamOut(); } - page += FPSTR(HTTP_FORM_END); + page += FPSTR(HTML_FORM_END); page += F("
"); - if(_wm->_showBack) page += FPSTR(HTTP_BACKBTN); + if(_wm->_showBack) page += FPSTR(HTML_BACKBTN); reportStatus(page); page += getHTTPEnd(); @@ -708,17 +807,14 @@ void WiFiManagerHandlers::handleParam(AsyncWebServerRequest *request){ _wm->DEBUG_WM(WM_DEBUG_VERBOSE, F("<- HTTP Param")); #endif handleRequest(request); - String page = getHTTPHead(FPSTR(S_titleparam), FPSTR(C_param)); + String page = getHTTPHead(F("Setup"), FPSTR(C_param)); - String pitem = ""; - - pitem = FPSTR(HTTP_FORM_START); - pitem.replace(FPSTR(T_v), F("paramsave")); - page += pitem; + // Build form start directly without tokens + page += F(""); page += getParamOut(); - page += FPSTR(HTTP_FORM_END); - if(_wm->_showBack) page += FPSTR(HTTP_BACKBTN); + page += FPSTR(HTML_FORM_END); + if(_wm->_showBack) page += FPSTR(HTML_BACKBTN); reportStatus(page); page += getHTTPEnd(); @@ -732,7 +828,7 @@ void WiFiManagerHandlers::handleParam(AsyncWebServerRequest *request){ void WiFiManagerHandlers::handleWifiSave(AsyncWebServerRequest *request) { #ifdef WM_DEBUG_LEVEL _wm->DEBUG_WM(WM_DEBUG_VERBOSE, F("<- HTTP WiFi save ")); - _wm->DEBUG_WM(WM_DEBUG_DEV, F("Method:"), request->method() == HTTP_GET ? FPSTR(S_GET) : FPSTR(S_POST)); + _wm->DEBUG_WM(WM_DEBUG_DEV, F("Method:"), request->method() == HTTP_GET ? F("GET") : F("POST")); #endif handleRequest(request); @@ -807,15 +903,15 @@ void WiFiManagerHandlers::handleWifiSave(AsyncWebServerRequest *request) { String page; if(_wm->_ssid == ""){ - page = getHTTPHead(FPSTR(S_titlewifisettings), FPSTR(C_wifi)); - page += FPSTR(HTTP_PARAMSAVED); + page = getHTTPHead(F("Settings saved"), FPSTR(C_wifi)); + page += FPSTR(HTML_PARAMSAVED); } else { - page = getHTTPHead(FPSTR(S_titlewifisaved), FPSTR(C_wifi)); - page += FPSTR(HTTP_SAVED); + page = getHTTPHead(F("Credentials saved"), FPSTR(C_wifi)); + page += FPSTR(HTML_SAVED); } - if(_wm->_showBack) page += FPSTR(HTTP_BACKBTN); + if(_wm->_showBack) page += FPSTR(HTML_BACKBTN); page += getHTTPEnd(); AsyncWebServerResponse *response = request->beginResponse(200, FPSTR(HTTP_HEAD_CT), page); @@ -832,7 +928,7 @@ void WiFiManagerHandlers::handleWifiSave(AsyncWebServerRequest *request) { void WiFiManagerHandlers::handleParamSave(AsyncWebServerRequest *request) { #ifdef WM_DEBUG_LEVEL _wm->DEBUG_WM(WM_DEBUG_VERBOSE, F("<- HTTP Param save ")); - _wm->DEBUG_WM(WM_DEBUG_DEV, F("Method:"), request->method() == HTTP_GET ? FPSTR(S_GET) : FPSTR(S_POST)); + _wm->DEBUG_WM(WM_DEBUG_DEV, F("Method:"), request->method() == HTTP_GET ? F("GET") : F("POST")); #endif handleRequest(request); @@ -840,9 +936,9 @@ void WiFiManagerHandlers::handleParamSave(AsyncWebServerRequest *request) { doParamSave(requestArgs); - String page = getHTTPHead(FPSTR(S_titleparamsaved), FPSTR(C_param)); - page += FPSTR(HTTP_PARAMSAVED); - if(_wm->_showBack) page += FPSTR(HTTP_BACKBTN); + String page = getHTTPHead(F("Setup saved"), FPSTR(C_param)); + page += FPSTR(HTML_PARAMSAVED); + if(_wm->_showBack) page += FPSTR(HTML_BACKBTN); page += getHTTPEnd(); request->send(200, FPSTR(HTTP_HEAD_CT), page); @@ -860,7 +956,7 @@ void WiFiManagerHandlers::doParamSave(WiFiManager::WiFiManagerRequestArgs reques if(_wm->_paramsCount > 0){ #ifdef WM_DEBUG_LEVEL _wm->DEBUG_WM(WM_DEBUG_VERBOSE,F("Parameters")); - _wm->DEBUG_WM(WM_DEBUG_VERBOSE,FPSTR(D_HR)); + _wm->DEBUG_WM(WM_DEBUG_VERBOSE,F("--------------------")); #endif for (int i = 0; i < _wm->_paramsCount; i++) { @@ -874,7 +970,7 @@ void WiFiManagerHandlers::doParamSave(WiFiManager::WiFiManagerRequestArgs reques String value; if (_wm->_params[i]->getID() == nullptr) { - String name = (String)FPSTR(S_parampre)+(String)i; + String name = "param_" + String(i); if (requestArgs.hasArg(name)) { value = requestArgs.getArg(name); @@ -882,7 +978,7 @@ void WiFiManagerHandlers::doParamSave(WiFiManager::WiFiManagerRequestArgs reques continue; } } else { - String name = (String)FPSTR(S_parampre)+(String)i; + String name = "param_" + String(i); if(requestArgs.hasArg(name)) { value = requestArgs.getArg(name); } else { @@ -896,7 +992,7 @@ void WiFiManagerHandlers::doParamSave(WiFiManager::WiFiManagerRequestArgs reques #endif } #ifdef WM_DEBUG_LEVEL - _wm->DEBUG_WM(WM_DEBUG_VERBOSE,FPSTR(D_HR)); + _wm->DEBUG_WM(WM_DEBUG_VERBOSE,F("--------------------")); #endif } @@ -911,7 +1007,7 @@ void WiFiManagerHandlers::handleInfo(AsyncWebServerRequest *request) { _wm->DEBUG_WM(WM_DEBUG_VERBOSE, F("<- HTTP Info")); #endif handleRequest(request); - String page = getHTTPHead(FPSTR(S_titleinfo), FPSTR(C_info)); + String page = getHTTPHead(F("Info"), FPSTR(C_info)); reportStatus(page); uint16_t infos = 0; @@ -995,12 +1091,12 @@ void WiFiManagerHandlers::handleInfo(AsyncWebServerRequest *request) { page += F("
"); if(_wm->_showInfoUpdate){ - page += HTTP_PORTAL_MENU[8]; - page += HTTP_PORTAL_MENU[9]; + page += HTML_PORTAL_MENU[8]; + page += HTML_PORTAL_MENU[9]; } - if(_wm->_showInfoErase) page += FPSTR(HTTP_ERASEBTN); - if(_wm->_showBack) page += FPSTR(HTTP_BACKBTN); - page += FPSTR(HTTP_HELP); + if(_wm->_showInfoErase) page += FPSTR(HTML_ERASEBTN); + if(_wm->_showBack) page += FPSTR(HTML_BACKBTN); + page += FPSTR(HTML_HELP); page += getHTTPEnd(); request->send(200, FPSTR(HTTP_HEAD_CT), page); @@ -1015,8 +1111,8 @@ void WiFiManagerHandlers::handleExit(AsyncWebServerRequest *request) { _wm->DEBUG_WM(WM_DEBUG_VERBOSE, F("<- HTTP Exit")); #endif handleRequest(request); - String page = getHTTPHead(FPSTR(S_titleexit), FPSTR(C_exit)); - page += FPSTR(S_exiting); + String page = getHTTPHead(F("Exit"), FPSTR(C_exit)); + page += F("Exiting"); page += getHTTPEnd(); AsyncWebServerResponse *response = request->beginResponse(200, FPSTR(HTTP_HEAD_CT), page); response->addHeader(F("Cache-Control"), F("no-cache, no-store, must-revalidate")); @@ -1031,8 +1127,8 @@ void WiFiManagerHandlers::handleReset(AsyncWebServerRequest *request) { _wm->DEBUG_WM(WM_DEBUG_VERBOSE, F("<- HTTP Reset")); #endif handleRequest(request); - String page = getHTTPHead(FPSTR(S_titlereset), FPSTR(C_restart)); - page += FPSTR(S_resetting); + String page = getHTTPHead(F("Reset"), FPSTR(C_restart)); + page += F("Module will reset in a few seconds."); page += getHTTPEnd(); request->send(200, FPSTR(HTTP_HEAD_CT), page); @@ -1049,13 +1145,13 @@ void WiFiManagerHandlers::handleErase(AsyncWebServerRequest *request, boolean op _wm->DEBUG_WM(WM_DEBUG_NOTIFY, F("<- HTTP Erase")); #endif handleRequest(request); - String page = getHTTPHead(FPSTR(S_titleerase), FPSTR(C_erase)); + String page = getHTTPHead(F("Erase"), FPSTR(C_erase)); bool ret = _wm->erase(opt); - if(ret) page += FPSTR(S_resetting); + if(ret) page += F("Module will reset in a few seconds."); else { - page += FPSTR(S_error); + page += F("An error occured"); #ifdef WM_DEBUG_LEVEL _wm->DEBUG_WM(WM_DEBUG_ERROR, F("[ERROR] WiFi EraseConfig failed")); #endif @@ -1080,8 +1176,8 @@ void WiFiManagerHandlers::handleClose(AsyncWebServerRequest *request){ _wm->DEBUG_WM(WM_DEBUG_VERBOSE, F("<- HTTP close")); #endif handleRequest(request); - String page = getHTTPHead(FPSTR(S_titleclose), FPSTR(C_close)); - page += FPSTR(S_closing); + String page = getHTTPHead(F("Close"), FPSTR(C_close)); + page += F("You can close the page, portal will continue to run"); page += getHTTPEnd(); request->send(200, FPSTR(HTTP_HEAD_CT), page); } @@ -1089,15 +1185,15 @@ void WiFiManagerHandlers::handleClose(AsyncWebServerRequest *request){ void WiFiManagerHandlers::handleNotFound(AsyncWebServerRequest *request) { if (captivePortal(request)) return; handleRequest(request); - String message = FPSTR(S_notfound); + String message = F("File not found\n\n"); bool verbose404 = false; if(verbose404){ - message += FPSTR(S_uri); + message += F("URI: "); message += request->url(); - message += FPSTR(S_method); - message += (request->method() == HTTP_GET) ? FPSTR(S_GET) : FPSTR(S_POST); - message += FPSTR(S_args); + message += F("\nMethod: "); + message += (request->method() == HTTP_GET) ? F("GET") : F("POST"); + message += F("\nArguments: "); message += request->params(); message += F("\n"); @@ -1120,7 +1216,7 @@ void WiFiManagerHandlers::handleWiFiStatus(AsyncWebServerRequest *request){ handleRequest(request); String page; #ifdef WM_JSTEST - page = FPSTR(HTTP_JS); + page = FPSTR(HTML_JS); #endif request->send(200, FPSTR(HTTP_HEAD_CT), page); } @@ -1198,12 +1294,14 @@ void WiFiManagerHandlers::handleUpdate(AsyncWebServerRequest *request) { #endif if (captivePortal(request)) return; String page = getHTTPHead(_wm->_title, FPSTR(C_update)); - String str = FPSTR(HTTP_ROOT_MAIN); - str.replace(FPSTR(T_t), _wm->_title); - str.replace(FPSTR(T_v), _wm->configPortalActive ? _wm->_apName : (_wm->getWiFiHostname() + " - " + WiFi.localIP().toString())); - page += str; + // Build root main HTML directly without tokens + page += F("

"); + page += _wm->_title; + page += F("

"); + page += (_wm->configPortalActive ? _wm->_apName : (_wm->getWiFiHostname() + " - " + WiFi.localIP().toString())); + page += F("

"); - page += FPSTR(HTTP_UPDATE); + page += FPSTR(HTML_UPDATE); page += getHTTPEnd(); request->send(200, FPSTR(HTTP_HEAD_CT), page); @@ -1280,21 +1378,23 @@ void WiFiManagerHandlers::handleUpdateDone(AsyncWebServerRequest *request) { _wm->DEBUG_WM(WM_DEBUG_VERBOSE, F("<- Handle update done")); #endif - String page = getHTTPHead(FPSTR(S_options), FPSTR(C_update)); - String str = FPSTR(HTTP_ROOT_MAIN); - str.replace(FPSTR(T_t), _wm->_title); - str.replace(FPSTR(T_v), _wm->configPortalActive ? _wm->_apName : WiFi.localIP().toString()); - page += str; + String page = getHTTPHead(F("options"), FPSTR(C_update)); + // Build root main HTML directly without tokens + page += F("

"); + page += _wm->_title; + page += F("

"); + page += (_wm->configPortalActive ? _wm->_apName : WiFi.localIP().toString()); + page += F("

"); if (Update.hasError()) { - page += FPSTR(HTTP_UPDATE_FAIL); + page += FPSTR(HTML_UPDATE_FAIL); #ifdef ESP32 page += "OTA Error: " + (String)Update.errorString(); #else page += "OTA Error: " + (String)Update.getError(); #endif } else { - page += FPSTR(HTTP_UPDATE_SUCCESS); + page += FPSTR(HTML_UPDATE_SUCCESS); } page += getHTTPEnd(); diff --git a/lib/WiFiManager/src/WiFiManagerUtils.cpp b/lib/WiFiManager/src/WiFiManagerUtils.cpp new file mode 100644 index 0000000..6d5c3de --- /dev/null +++ b/lib/WiFiManager/src/WiFiManagerUtils.cpp @@ -0,0 +1,135 @@ +/** + * WiFiManagerUtils.cpp + * Implementation of pure utility functions for WiFiManager + * + * @author Alex Hope-O'Connor + * @license MIT + */ + +#include "WiFiManagerUtils.h" + +#if defined(ESP8266) +#include +#elif defined(ESP32) +#include +#endif + +namespace WiFiManagerUtils { + +// ----------------------------------------------------------------------------------------------- +// WIFI STATUS ARRAYS + +const char * const WIFI_STA_STATUS[] PROGMEM = { + "WL_IDLE_STATUS", // 0 STATION_IDLE + "WL_NO_SSID_AVAIL", // 1 STATION_NO_AP_FOUND + "WL_SCAN_COMPLETED", // 2 + "WL_CONNECTED", // 3 STATION_GOT_IP + "WL_CONNECT_FAILED", // 4 STATION_CONNECT_FAIL, STATION_WRONG_PASSWORD(NI) + "WL_CONNECTION_LOST", // 5 + "WL_DISCONNECTED", // 6 + "WL_STATION_WRONG_PASSWORD" // 7 KLUDGE +}; + +#ifdef ESP32 +const char * const AUTH_MODE_NAMES[] PROGMEM = { + "OPEN", + "WEP", + "WPA_PSK", + "WPA2_PSK", + "WPA_WPA2_PSK", + "WPA2_ENTERPRISE", + "MAX" +}; +#elif defined(ESP8266) +const char * const AUTH_MODE_NAMES[] PROGMEM = { + "", + "", + "WPA_PSK", // 2 ENC_TYPE_TKIP + "", + "WPA2_PSK", // 4 ENC_TYPE_CCMP + "WEP", // 5 ENC_TYPE_WEP + "", + "OPEN", //7 ENC_TYPE_NONE + "WPA_WPA2_PSK", // 8 ENC_TYPE_AUTO +}; +#endif + +const char* const WIFI_MODES[] PROGMEM = { "NULL", "STA", "AP", "STA+AP" }; + +// ----------------------------------------------------------------------------------------------- +// STRING CONVERSION UTILITIES + +String getStatusString(uint8_t status) { + if(status <= 7) return FPSTR(WIFI_STA_STATUS[status]); + return F("Unknown"); +} + + +String getModeString(uint8_t mode) { + if(mode <= 3) return FPSTR(WIFI_MODES[mode]); + return F("Unknown"); +} + +String getEncryptionString(uint8_t authmode) { + return FPSTR(AUTH_MODE_NAMES[authmode]); +} + +// ----------------------------------------------------------------------------------------------- +// HTML UTILITIES + +String htmlEntities(const String& str, bool whitespace) { + String result = str; + result.replace("&","&"); + result.replace("<","<"); + result.replace(">",">"); + result.replace("'","'"); + if(whitespace) result.replace(" "," "); + return result; +} + +// ----------------------------------------------------------------------------------------------- +// IP/STRING UTILITIES + +bool isValidIP(const String& str) { + for (size_t i = 0; i < str.length(); i++) { + int c = str.charAt(i); + if (c != '.' && (c < '0' || c > '9')) { + return false; + } + } + return true; +} + +String ipToString(IPAddress ip) { + String res = ""; + for (int i = 0; i < 3; i++) { + res += String((ip >> (8 * i)) & 0xFF) + "."; + } + res += String(((ip >> 8 * 3)) & 0xFF); + return res; +} + +bool isValidAPPassword(const String& password) { + if (password.length() < 8 || password.length() > 63) { + return false; + } + return true; +} + +// ----------------------------------------------------------------------------------------------- +// HELPER CALCULATIONS + +int rssiToQuality(int rssi) { + int quality = 0; + if (rssi <= -100) { + quality = 0; + } else if (rssi >= -50) { + quality = 100; + } else { + quality = 2 * (rssi + 100); + } + return quality; +} + +} // namespace WiFiManagerUtils + diff --git a/platformio.ini b/platformio.ini index 8f1b96b..96a8dd2 100644 --- a/platformio.ini +++ b/platformio.ini @@ -18,6 +18,10 @@ framework = arduino monitor_speed = 115200 test_framework = unity test_build_src = no +build_unflags = + -std=gnu++11 +build_flags = + -std=gnu++14 lib_deps = ESP32Async/ESPAsyncWebServer@3.8.1