From da96cc01856b03d1e9e49c914f698f581aee7478 Mon Sep 17 00:00:00 2001 From: Delf Date: Tue, 24 Dec 2019 00:43:45 +0300 Subject: [PATCH] Fix build on ESP8266 boards v2.6.0+ --- libraries/WiFiManager/WiFiManager.cpp | 10 +++++----- libraries/WiFiManager/WiFiManager.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/WiFiManager/WiFiManager.cpp b/libraries/WiFiManager/WiFiManager.cpp index 2e7884d3..740b46b1 100644 --- a/libraries/WiFiManager/WiFiManager.cpp +++ b/libraries/WiFiManager/WiFiManager.cpp @@ -420,7 +420,7 @@ void WiFiManager::handleRoot() { return; } - String page = FPSTR(HTTP_HEAD); + String page = FPSTR(HTTP_HEAD_START); page.replace("{v}", "Options"); page += FPSTR(HTTP_SCRIPT); page += FPSTR(HTTP_STYLE); @@ -441,7 +441,7 @@ void WiFiManager::handleRoot() { /** Wifi config page handler */ void WiFiManager::handleWifi(boolean scan) { - String page = FPSTR(HTTP_HEAD); + String page = FPSTR(HTTP_HEAD_START); page.replace("{v}", "Config ESP"); page += FPSTR(HTTP_SCRIPT); page += FPSTR(HTTP_STYLE); @@ -636,7 +636,7 @@ void WiFiManager::handleWifiSave() { optionalIPFromString(&_sta_static_sn, sn.c_str()); } - String page = FPSTR(HTTP_HEAD); + String page = FPSTR(HTTP_HEAD_START); page.replace("{v}", "Credentials Saved"); page += FPSTR(HTTP_SCRIPT); page += FPSTR(HTTP_STYLE); @@ -657,7 +657,7 @@ void WiFiManager::handleWifiSave() { void WiFiManager::handleInfo() { DEBUG_WM(F("Info")); - String page = FPSTR(HTTP_HEAD); + String page = FPSTR(HTTP_HEAD_START); page.replace("{v}", "Info"); page += FPSTR(HTTP_SCRIPT); page += FPSTR(HTTP_STYLE); @@ -698,7 +698,7 @@ void WiFiManager::handleInfo() { void WiFiManager::handleReset() { DEBUG_WM(F("Reset")); - String page = FPSTR(HTTP_HEAD); + String page = FPSTR(HTTP_HEAD_START); page.replace("{v}", "Info"); page += FPSTR(HTTP_SCRIPT); page += FPSTR(HTTP_STYLE); diff --git a/libraries/WiFiManager/WiFiManager.h b/libraries/WiFiManager/WiFiManager.h index 64bb96e6..8977d5f0 100644 --- a/libraries/WiFiManager/WiFiManager.h +++ b/libraries/WiFiManager/WiFiManager.h @@ -22,7 +22,7 @@ extern "C" { #include "user_interface.h" } -const char HTTP_HEAD[] PROGMEM = "{v}"; +const char HTTP_HEAD_START[] PROGMEM = "{v}"; const char HTTP_STYLE[] PROGMEM = ""; const char HTTP_SCRIPT[] PROGMEM = ""; const char HTTP_HEAD_END[] PROGMEM = "
"; @@ -125,7 +125,7 @@ class WiFiManager //const int WM_DONE = 0; //const int WM_WAIT = 10; - //const String HTTP_HEAD = "{v}"; + //const String HTTP_HEAD_START = "{v}"; void setupConfigPortal(); void startWPS();