From 05506cdc9fa4002b925713101e1422b60776c29e Mon Sep 17 00:00:00 2001 From: Gunnar Skjold Date: Sun, 21 Apr 2024 10:35:30 +0200 Subject: [PATCH] Fixed ESP8266 build issue --- lib/SvelteUi/include/AmsWebServer.h | 6 +++++- lib/SvelteUi/src/AmsWebServer.cpp | 28 +++++++++++++++++----------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/lib/SvelteUi/include/AmsWebServer.h b/lib/SvelteUi/include/AmsWebServer.h index 9acf026f..66b08b21 100644 --- a/lib/SvelteUi/include/AmsWebServer.h +++ b/lib/SvelteUi/include/AmsWebServer.h @@ -20,7 +20,6 @@ #include "PriceService.h" #include "RealtimePlot.h" #include "ConnectionHandler.h" -#include "CloudConnector.h" #if defined(ESP8266) #include @@ -34,6 +33,7 @@ #include #include #include + #include "CloudConnector.h" #else #warning "Unsupported board type" #endif @@ -45,7 +45,9 @@ public: AmsWebServer(uint8_t* buf, RemoteDebug* Debug, HwTools* hw, ResetDataContainer* rdc); void setup(AmsConfiguration*, GpioConfig*, AmsData*, AmsDataStorage*, EnergyAccounting*, RealtimePlot*); void loop(); + #if defined(ESP32) void setCloud(CloudConnector* cloud); + #endif void setTimezone(Timezone* tz); void setMqttEnabled(bool); void setPriceService(PriceService* ps); @@ -74,7 +76,9 @@ private: RealtimePlot* rtp = NULL; AmsMqttHandler* mqttHandler = NULL; ConnectionHandler* ch = NULL; + #if defined(ESP32) CloudConnector* cloud = NULL; + #endif bool uploading = false; File file; bool performRestart = false; diff --git a/lib/SvelteUi/src/AmsWebServer.cpp b/lib/SvelteUi/src/AmsWebServer.cpp index c1799fef..cbc04657 100644 --- a/lib/SvelteUi/src/AmsWebServer.cpp +++ b/lib/SvelteUi/src/AmsWebServer.cpp @@ -162,9 +162,11 @@ void AmsWebServer::setup(AmsConfiguration* config, GpioConfig* gpioConfig, AmsDa mqttEnabled = strlen(mqttConfig.host) > 0; } +#if defined(ESP32) void AmsWebServer::setCloud(CloudConnector* cloud) { this->cloud = cloud; } +#endif void AmsWebServer::setTimezone(Timezone* tz) { this->tz = tz; @@ -1093,18 +1095,22 @@ void AmsWebServer::translationsJson() { void AmsWebServer::cloudkeyJson() { if(!checkSecurity(1)) return; - if(cloud == NULL) + #if defined(ESP32) + if(cloud == NULL) + notFound(); + + String seed = cloud->generateSeed(); + + snprintf_P(buf, BufferSize, PSTR("{\"seed\":\"%s\"}"), seed.c_str()); + + server.setContentLength(strlen(buf)); + server.sendHeader(HEADER_CACHE_CONTROL, CACHE_CONTROL_NO_CACHE); + server.sendHeader(HEADER_PRAGMA, PRAGMA_NO_CACHE); + server.sendHeader(HEADER_EXPIRES, EXPIRES_OFF); + server.send(200, MIME_JSON, buf); + #else notFound(); - - String seed = cloud->generateSeed(); - - snprintf_P(buf, BufferSize, PSTR("{\"seed\":\"%s\"}"), seed.c_str()); - - server.setContentLength(strlen(buf)); - server.sendHeader(HEADER_CACHE_CONTROL, CACHE_CONTROL_NO_CACHE); - server.sendHeader(HEADER_PRAGMA, PRAGMA_NO_CACHE); - server.sendHeader(HEADER_EXPIRES, EXPIRES_OFF); - server.send(200, MIME_JSON, buf); + #endif } void AmsWebServer::handleSave() {