From 9a571226cd8279f300efaef91e555c5acf51fd7b Mon Sep 17 00:00:00 2001 From: Shawn A Date: Thu, 16 Nov 2017 14:06:36 -0600 Subject: [PATCH] Added some info panel changes adds connect info to root info and wifi, minimal wordyness --- WiFiManager.cpp | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/WiFiManager.cpp b/WiFiManager.cpp index 6c9f600..1006617 100644 --- a/WiFiManager.cpp +++ b/WiFiManager.cpp @@ -541,8 +541,10 @@ void WiFiManager::handleRoot() { page += ""; page += F("

WiFiManager

"); page += FPSTR(HTTP_PORTAL_OPTIONS); + reportStatus(page); page += FPSTR(HTTP_END); + server->sendHeader("Content-Length", String(page.length())); server->send(200, "text/html", page); // server->close(); // testing reliability fix for content length mismatches during mutiple flood hits @@ -576,6 +578,7 @@ void WiFiManager::handleWifi(boolean scan) { page += FPSTR(HTTP_FORM_END); page += FPSTR(HTTP_SCAN_LINK); + reportStatus(page); page += FPSTR(HTTP_END); server->sendHeader("Content-Length", String(page.length())); @@ -868,9 +871,8 @@ void WiFiManager::handleInfo() { page += _customHeadElement; page += FPSTR(HTTP_HEAD_END); - page += "
"; reportStatus(page); - page +="
"; + // @todo add versioning here page += F("

esp8266


"); @@ -1039,23 +1041,27 @@ void WiFiManager::handleExit() { } void WiFiManager::reportStatus(String &page){ + if (WiFi.SSID() != ""){ - page += F("Configured to connect to access point "); - page += WiFi.SSID(); - if (WiFi.status()==WL_CONNECTED){ - page += F(" and currently connected on IP "); - page += WiFi.localIP().toString(); - page += F(""); - } - else { - page += F(" but not currently connected to network."); - } - } - else { - page += F("No AP currently configured."); - } + if (WiFi.status()==WL_CONNECTED){ + page += "
"; + page += F("Connected to "); + page += WiFi.SSID(); + page += F("sdfsdfsfsadfasdfsdfsafsdf
with IP "); + page += WiFi.localIP().toString(); + page += F(""); + } else { + page += "
"; + page += "Not Connected to "; + page += WiFi.SSID(); + } + } else { + page += "
"; + page += "No AP set"; + } + page += "
"; } /**