ElixirForge/WiFiManager
1
0
Fork 0
mirror of https://github.com/alexhopeoconnor/WiFiManager.git synced 2026-10-04 02:48:13 +10:00
Code Releases Activity

rework #974

Browse Source 
make compatible with params page
This commit is contained in:
tablatronix
2019-11-29 20:04:31 -06:00
parent 7882c0e9a9
commit 636027cabc
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WiFiManager.cpp
+11 -9
View File
@@ -1335,6 +1335,8 @@ void WiFiManager::handleWifiSave() {
_ssid = server->arg(F("s")).c_str();
_pass = server->arg(F("p")).c_str();
if(_paramsInWifi) doParamSave();
if (server->arg(FPSTR(S_ip)) != "") {
//_sta_static_ip.fromString(server->arg(FPSTR(S_ip));
String ip = server->arg(FPSTR(S_ip));
@@ -1357,16 +1359,16 @@ void WiFiManager::handleWifiSave() {
DEBUG_WM(DEBUG_DEV,F("static DNS:"),dns);
}
if(_paramsInWifi){
if(_ssid == ""){
handleParamSave(); // send param save result and not wifi connect if no wifi creds
return;
}
else doParamSave();
}
String page;
String page = getHTTPHead(FPSTR(S_titlewifisaved)); // @token titlewifisaved
page += FPSTR(HTTP_SAVED);
if(_ssid == ""){
page = getHTTPHead(FPSTR(S_titlewifisettings)); // @token titleparamsaved
page += FPSTR(HTTP_PARAMSAVED);
}
else {
String page = getHTTPHead(FPSTR(S_titlewifisaved)); // @token titlewifisaved
page += FPSTR(HTTP_SAVED);
}
page += FPSTR(HTTP_END);
server->sendHeader(FPSTR(HTTP_HEAD_CL), String(page.length()));
examples/DEV/OnDemandConfigPortal/OnDemandConfigPortal.ino
+2 -2
View File
@@ -172,9 +172,9 @@ void setup() {
// wm.setMenu(menu,9); // custom menu array must provide length
std::vector<const char *> menu = {"wifi","wifinoscan","info","param","close","sep","erase","restart","exit"};
// wm.setMenu(menu); // custom menu, pass vector
wm.setMenu(menu); // custom menu, pass vector
// wm.setParamsPage(true); // move params to seperate page, not wifi
// wm.setParamsPage(true); // move params to seperate page, not wifi, do not combine with setmenu!
// set static sta ip
// wm.setSTAStaticIPConfig(IPAddress(10,0,1,99), IPAddress(10,0,1,1), IPAddress(255,255,255,0));
strings_en.h
+1
View File
@@ -191,6 +191,7 @@ 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";