From b951fe90992c4d6ad4d778d9ef809b111eec0bfb Mon Sep 17 00:00:00 2001 From: Gunnar Skjold Date: Sat, 6 Jan 2024 19:11:22 +0100 Subject: [PATCH] Fixed 8266 build --- lib/CloudConnector/src/CloudConnector.cpp | 4 ++++ lib/SvelteUi/src/AmsWebServer.cpp | 1 - platformio.ini | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/CloudConnector/src/CloudConnector.cpp b/lib/CloudConnector/src/CloudConnector.cpp index 03992016..bfe41983 100644 --- a/lib/CloudConnector/src/CloudConnector.cpp +++ b/lib/CloudConnector/src/CloudConnector.cpp @@ -9,7 +9,9 @@ #include "crc.h" #include "Uptime.h" #include "hexutils.h" +#if defined(ESP32) #include +#endif CloudConnector::CloudConnector(RemoteDebug* debugger) { this->debugger = debugger; @@ -36,11 +38,13 @@ CloudConnector::CloudConnector(RemoteDebug* debugger) { bool CloudConnector::setup(CloudConfig& config, MeterConfig& meter, HwTools* hw) { bool ret = false; + #if defined(ESP32) if(!ESPRandom::isValidV4Uuid(config.clientId)) { ESPRandom::uuid4(config.clientId); ret = true; } uuid = ESPRandom::uuidToString(config.clientId); + #endif this->config = config; this->hw = hw; diff --git a/lib/SvelteUi/src/AmsWebServer.cpp b/lib/SvelteUi/src/AmsWebServer.cpp index 5c010506..da3c0b9c 100644 --- a/lib/SvelteUi/src/AmsWebServer.cpp +++ b/lib/SvelteUi/src/AmsWebServer.cpp @@ -39,7 +39,6 @@ #include "html/conf_ui_json.h" #include "html/conf_cloud_json.h" #include "html/firmware_html.h" -#include #if defined(ESP32) #include diff --git a/platformio.ini b/platformio.ini index 51854415..93a7db52 100755 --- a/platformio.ini +++ b/platformio.ini @@ -2,7 +2,7 @@ extra_configs = platformio-user.ini [common] -lib_deps = EEPROM, LittleFS, DNSServer, https://github.com/256dpi/arduino-mqtt.git, OneWireNg@0.10.0, DallasTemperature@3.9.1, EspSoftwareSerial@6.14.1, https://github.com/gskjold/RemoteDebug.git, Time@1.6.1, Timezone@1.2.4, mulmer89/ESPRandom@1.5.0, FirmwareVersion, AmsConfiguration, AmsData, AmsDataStorage, HwTools, Uptime, AmsDecoder, PriceService, EnergyAccounting, AmsMqttHandler, RawMqttHandler, JsonMqttHandler, DomoticzMqttHandler, HomeAssistantMqttHandler, RealtimePlot, ConnectionHandler, SvelteUi +lib_deps = EEPROM, LittleFS, DNSServer, https://github.com/256dpi/arduino-mqtt.git, OneWireNg@0.10.0, DallasTemperature@3.9.1, EspSoftwareSerial@6.14.1, https://github.com/gskjold/RemoteDebug.git, Time@1.6.1, Timezone@1.2.4, FirmwareVersion, AmsConfiguration, AmsData, AmsDataStorage, HwTools, Uptime, AmsDecoder, PriceService, EnergyAccounting, AmsMqttHandler, RawMqttHandler, JsonMqttHandler, DomoticzMqttHandler, HomeAssistantMqttHandler, RealtimePlot, ConnectionHandler, SvelteUi lib_ignore = OneWire extra_scripts = pre:scripts/addversion.py @@ -19,7 +19,7 @@ build_flags = -fexceptions [esp32] -lib_deps = WiFi, Ethernet, ESPmDNS, WiFiClientSecure, HTTPClient, FS, Update, HTTPUpdate, WebServer, ESP32 Async UDP, ESP32SSDP, ${common.lib_deps}, CloudConnector +lib_deps = WiFi, Ethernet, ESPmDNS, WiFiClientSecure, HTTPClient, FS, Update, HTTPUpdate, WebServer, ESP32 Async UDP, ESP32SSDP, mulmer89/ESPRandom@1.5.0, ${common.lib_deps}, CloudConnector [env:esp8266] platform = espressif8266@4.2.0