From e28794c77a683aa9d3cb0bc4ada9bb8dc79f8f81 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Wed, 30 Oct 2024 16:50:48 +0100 Subject: [PATCH] fix upgradeable for release version --- interface/src/app/settings/Version.tsx | 8 +++++++- src/web/WebStatusService.cpp | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/interface/src/app/settings/Version.tsx b/interface/src/app/settings/Version.tsx index c6aaa5827..9b9f8d79f 100644 --- a/interface/src/app/settings/Version.tsx +++ b/interface/src/app/settings/Version.tsx @@ -59,6 +59,10 @@ const Version = () => { // uncomment next 2 lines for testing, uses https://github.com/emsesp/EMS-ESP32/releases/download/v3.6.5/EMS-ESP-3_6_5-ESP32-16MB+.bin // immediate: false, // initialData: '3.6.5' + }).onSuccess((event) => { + if (!useDev) { + void sendCheckUpgrade(event.data); + } }); // called immediately to get the latest version, on page load, then check for upgrade (works for both dev and stable) @@ -67,7 +71,9 @@ const Version = () => { // immediate: false, // initialData: '3.7.0-dev.32' }).onSuccess((event) => { - void sendCheckUpgrade(event.data); + if (useDev) { + void sendCheckUpgrade(event.data); + } }); const STABLE_URL = 'https://github.com/emsesp/EMS-ESP32/releases/download/'; diff --git a/src/web/WebStatusService.cpp b/src/web/WebStatusService.cpp index 8e46907e2..4c15f0227 100644 --- a/src/web/WebStatusService.cpp +++ b/src/web/WebStatusService.cpp @@ -208,7 +208,7 @@ bool WebStatusService::checkUpgrade(JsonObject root, std::string & latest_versio if (!latest_version.empty()) { #if defined(EMSESP_DEBUG) - emsesp::EMSESP::logger().debug("Checking for upgrade: %s > %s", EMSESP_APP_VERSION, latest_version.c_str()); + emsesp::EMSESP::logger().debug("Checking for upgrade: %s < %s", EMSESP_APP_VERSION, latest_version.c_str()); #endif version::Semver200_version settings_version(EMSESP_APP_VERSION);