From c74e719327a35ab692ac72251f1c972412e32afd Mon Sep 17 00:00:00 2001 From: Gunnar Skjold Date: Sat, 13 Apr 2024 11:38:03 +0200 Subject: [PATCH] Fixed ESP8266 build issue --- lib/SvelteUi/src/AmsWebServer.cpp | 4 ++++ src/AmsToMqttBridge.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/lib/SvelteUi/src/AmsWebServer.cpp b/lib/SvelteUi/src/AmsWebServer.cpp index 6ed9488f..0e0047ae 100644 --- a/lib/SvelteUi/src/AmsWebServer.cpp +++ b/lib/SvelteUi/src/AmsWebServer.cpp @@ -1652,7 +1652,11 @@ void AmsWebServer::upgradeFromUrl(String url, String nextVersion) { httpUpdate.rebootOnUpdate(false); httpUpdate.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS); + #if defined(ESP32) HTTPUpdateResult ret = httpUpdate.update(client, url, currentVersion, std::bind(&AmsWebServer::updaterRequestCallback, this, std::placeholders::_1)); + #else + HTTPUpdateResult ret = httpUpdate.update(client, url, currentVersion); + #endif int lastError = httpUpdate.getLastError(); config->setUpgradeInformation(ret, ret == HTTP_UPDATE_OK ? 0 : lastError, FirmwareVersion::VersionString, nextVersion.c_str()); diff --git a/src/AmsToMqttBridge.cpp b/src/AmsToMqttBridge.cpp index 881b5d4f..060172a8 100644 --- a/src/AmsToMqttBridge.cpp +++ b/src/AmsToMqttBridge.cpp @@ -916,9 +916,11 @@ void handleEnergyAccountingChanged() { config.getEnergyAccountingConfig(*eac); ea.setup(&ds, eac); config.ackEnergyAccountingChange(); + #if defined(ESP32) if(cloud != NULL) { cloud->setEnergyAccountingConfig(*eac); } + #endif } char ntpServerName[64] = ""; @@ -1055,9 +1057,11 @@ void handlePriceService(unsigned long now) { ps = new PriceService(&Debug); ea.setPriceService(ps); ws.setPriceService(ps); + #if defined(ESP32) if(cloud != NULL) { cloud->setPriceConfig(price); } + #endif } ps->setup(price); } else if(ps != NULL) {