Merge remote-tracking branch 'remotes/tzapu/development' into tzapu/development

removed autoconnect params, still testing valeus are always empty
This commit is contained in:
Shawn A
2017-09-08 17:08:18 -05:00
2 changed files with 5 additions and 4 deletions
+4 -4
View File
@@ -634,14 +634,14 @@ void WiFiManager::handleWifi(boolean scan) {
page += "<br/>";
}
if (_sta_static_ip) {
if (_sta_show_static_fields || _sta_static_ip) {
String item = FPSTR(HTTP_FORM_PARAM);
item.replace("{i}", "ip");
item.replace("{n}", "ip");
item.replace("{p}", "Static IP");
item.replace("{l}", "15");
item.replace("{v}", _sta_static_ip.toString());
item.replace("{v}", (_sta_static_ip ? _sta_static_ip.toString() : ""));
page += item;
@@ -650,7 +650,7 @@ void WiFiManager::handleWifi(boolean scan) {
item.replace("{n}", "gw");
item.replace("{p}", "Static Gateway");
item.replace("{l}", "15");
item.replace("{v}", _sta_static_gw.toString());
item.replace("{v}", (_sta_static_gw ? _sta_static_gw.toString() : ""));
page += item;
@@ -659,7 +659,7 @@ void WiFiManager::handleWifi(boolean scan) {
item.replace("{n}", "sn");
item.replace("{p}", "Subnet");
item.replace("{l}", "15");
item.replace("{v}", _sta_static_sn.toString());
item.replace("{v}", (_sta_static_sn ? _sta_static_sn.toString() : ""));
page += item;
+1
View File
@@ -176,6 +176,7 @@ class WiFiManager
IPAddress _sta_static_ip;
IPAddress _sta_static_gw;
IPAddress _sta_static_sn;
boolean _sta_show_static_fields = true;
// option parameters
int _paramsCount = 0;