From 63cb8c5f549082b24d286311bd9f7757dbf8f62f Mon Sep 17 00:00:00 2001 From: MrDornback <44899313+MrDornback@users.noreply.github.com> Date: Wed, 29 Apr 2020 23:19:02 -0400 Subject: [PATCH] HTTP_HEAD Fix Updated code to use HTTP_HEADER_START and HTTP_HEADER_END. HTTP_HEAD results in a conflict with ESP8266WebServer. --- WiFiManager.cpp | 20 ++++++++++---------- WiFiManager.h | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/WiFiManager.cpp b/WiFiManager.cpp index 9a58d48..253fe21 100644 --- a/WiFiManager.cpp +++ b/WiFiManager.cpp @@ -448,12 +448,12 @@ void WiFiManager::handleRoot() { return; } - String page = FPSTR(HTTP_HEAD); + String page = FPSTR(HTTP_HEADER_START); page.replace("{v}", "Options"); page += FPSTR(HTTP_SCRIPT); page += FPSTR(HTTP_STYLE); page += _customHeadElement; - page += FPSTR(HTTP_HEAD_END); + page += FPSTR(HTTP_HEADER_END); page += "

"; page += _apName; page += "

"; @@ -468,12 +468,12 @@ void WiFiManager::handleRoot() { /** Wifi config page handler */ void WiFiManager::handleWifi(boolean scan) { - String page = FPSTR(HTTP_HEAD); + String page = FPSTR(HTTP_HEADER_START); page.replace("{v}", "Config OurWeather"); page += FPSTR(HTTP_SCRIPT); page += FPSTR(HTTP_STYLE); page += _customHeadElement; - page += FPSTR(HTTP_HEAD_END); + page += FPSTR(HTTP_HEADER_END); if (scan) { int n = WiFi.scanNetworks(); @@ -690,12 +690,12 @@ void WiFiManager::handleWifiSave() { } else DEBUG_WM("Not updating DateTime in RTC"); - String page = FPSTR(HTTP_HEAD); + String page = FPSTR(HTTP_HEADER_START); page.replace("{v}", "Credentials Saved"); page += FPSTR(HTTP_SCRIPT); page += FPSTR(HTTP_STYLE); page += _customHeadElement; - page += FPSTR(HTTP_HEAD_END); + page += FPSTR(HTTP_HEADER_END); page += FPSTR(HTTP_SAVED); page += FPSTR(HTTP_END); @@ -710,12 +710,12 @@ void WiFiManager::handleWifiSave() { void WiFiManager::handleInfo() { DEBUG_WM(F("Info")); - String page = FPSTR(HTTP_HEAD); + String page = FPSTR(HTTP_HEADER_START); page.replace("{v}", "Info"); page += FPSTR(HTTP_SCRIPT); page += FPSTR(HTTP_STYLE); page += _customHeadElement; - page += FPSTR(HTTP_HEAD_END); + page += FPSTR(HTTP_HEADER_END); page += F("
"); page += F("
Chip ID
"); page += ESP.getChipId(); @@ -750,12 +750,12 @@ void WiFiManager::handleInfo() { void WiFiManager::handleReset() { DEBUG_WM(F("Reset")); - String page = FPSTR(HTTP_HEAD); + String page = FPSTR(HTTP_HEADER_START); page.replace("{v}", "Info"); page += FPSTR(HTTP_SCRIPT); page += FPSTR(HTTP_STYLE); page += _customHeadElement; - page += FPSTR(HTTP_HEAD_END); + page += FPSTR(HTTP_HEADER_END); page += F("Module will reset in a few seconds."); page += FPSTR(HTTP_END); server->send(200, "text/html", page); diff --git a/WiFiManager.h b/WiFiManager.h index 5ea2c26..96ad55a 100644 --- a/WiFiManager.h +++ b/WiFiManager.h @@ -42,7 +42,7 @@ void writeEEPROMState(); void updateDisplay(int displayType); /* const char HTTP_200[] PROGMEM = "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n"; -const char HTTP_HEAD[] PROGMEM = "{v}"; +const char HTTP_HEADER_START[] PROGMEM = "{v}"; const char HTTP_STYLE[] PROGMEM = ""; const char HTTP_SCRIPT[] PROGMEM = ""; const char HTTP_HEAD_END[] PROGMEM = "
"; @@ -57,10 +57,10 @@ const char HTTP_END[] PROGMEM = "
"; const char HTTP_200[] PROGMEM = "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n"; -const char HTTP_HEAD[] PROGMEM = "{v}"; +const char HTTP_HEADER_START[] PROGMEM = "{v}"; const char HTTP_STYLE[] PROGMEM = ""; const char HTTP_SCRIPT[] PROGMEM = ""; -const char HTTP_HEAD_END[] PROGMEM = "
"; +const char HTTP_HEADER_END[] PROGMEM = "
"; //const char HTTP_PORTAL_OPTIONS[] PROGMEM = "SwitchDoc Labs OurWeather

"; const char HTTP_PORTAL_OPTIONS[] PROGMEM = "SwitchDoc Labs OurWeather
"; //const char HTTP_PORTAL_OPTIONS[] PROGMEM = "



"; @@ -163,7 +163,7 @@ class WiFiManager //const int WM_DONE = 0; //const int WM_WAIT = 10; - //const String HTTP_HEAD = "{v}"; + //const String HTTP_HEADER_START = "{v}"; void setupConfigPortal(); #ifdef NO_EXTRA_4K_HEAP