From 3312f88804701b82d9283509aa43d30bf2697268 Mon Sep 17 00:00:00 2001 From: Gunnar Skjold Date: Tue, 28 Jan 2020 18:17:20 +0100 Subject: [PATCH] Some changes to make it compile for both ESP8266 and ESP32 --- .gitignore | 3 ++- lib/HanConfigAp/src/HanConfigAp.cpp | 6 ++++-- platformio.ini | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 97877088..e86f0cf3 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ *.sw[op] .vscode .pio -platformio-user.ini \ No newline at end of file +platformio-user.ini +src/version.h \ No newline at end of file diff --git a/lib/HanConfigAp/src/HanConfigAp.cpp b/lib/HanConfigAp/src/HanConfigAp.cpp index 1c901e49..b43364cf 100644 --- a/lib/HanConfigAp/src/HanConfigAp.cpp +++ b/lib/HanConfigAp/src/HanConfigAp.cpp @@ -107,7 +107,7 @@ void HanConfigAp::handleRoot() { configuration *config = new configuration(); config->load(); - String html = CONFIG_HTML; + String html = String((const __FlashStringHelper*) CONFIG_HTML); if(config->hasConfig()) { bool access = !config->isAuth(); @@ -201,10 +201,12 @@ void HanConfigAp::handleRoot() { void HanConfigAp::handleStyle() { println("Serving /style.css over http..."); + String css = String((const __FlashStringHelper*) STYLE_CSS); + server.sendHeader("Cache-Control", "no-cache, no-store, must-revalidate"); server.sendHeader("Pragma", "no-cache"); server.sendHeader("Expires", "-1"); - server.send(200, "text/html", STYLE_CSS, sizeof(STYLE_CSS)); + server.send(200, "text/css", css); } void HanConfigAp::handleSave() { diff --git a/platformio.ini b/platformio.ini index 84250766..091c3d93 100755 --- a/platformio.ini +++ b/platformio.ini @@ -3,7 +3,7 @@ extra_configs = platformio-user.ini [common] framework = arduino -lib_deps = HanConfigAp@1.0.0, HanReader@1.0.0, HanToJson@1.0.0, ArduinoJson@^6.0.0, MQTT@^2.4.0, DallasTemperature@^3.8.0, Base64@0.0.1 +lib_deps = HanConfigAp@1.0.0, HanReader@1.0.0, HanToJson@1.0.0, ArduinoJson@^6.0.0, MQTT@^2.4.0, DallasTemperature@^3.8.0 [env:esp12e] platform = espressif8266