From 971e2869a24e8729a90b3e2dc012564e801608f5 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Wed, 30 Oct 2024 16:47:19 +0100 Subject: [PATCH 1/4] log mention thermostat dst setting --- src/devices/thermostat.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp index 9e0f7cc26..7e93f60f2 100644 --- a/src/devices/thermostat.cpp +++ b/src/devices/thermostat.cpp @@ -1605,10 +1605,11 @@ void Thermostat::process_RCTime(std::shared_ptr telegram) { if (setTimeRetry < 3) { if (!use_dst) { set_datetime("ntp", 0); // set from NTP without dst + LOG_INFO("thermostat time correction from ntp, ignoring dst"); } else { set_datetime("ntp", -1); // set from NTP + LOG_INFO("thermostat time correction from ntp"); } - LOG_INFO("thermostat time correction from ntp"); setTimeRetry++; } } else { From 3dd67acc8df49912aea89c6947fd4fa5c01bc497 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Wed, 30 Oct 2024 16:48:32 +0100 Subject: [PATCH 2/4] fix changing TZ in NTPsettings without clearing enable+server --- interface/src/app/settings/NTPSettings.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/app/settings/NTPSettings.tsx b/interface/src/app/settings/NTPSettings.tsx index dd2e0bb29..277744e0d 100644 --- a/interface/src/app/settings/NTPSettings.tsx +++ b/interface/src/app/settings/NTPSettings.tsx @@ -71,12 +71,12 @@ const NTPSettings = () => { }; const changeTimeZone = (event: React.ChangeEvent) => { - updateFormValue(event); void updateState(readNTPSettings(), (settings: NTPSettingsType) => ({ ...settings, tz_label: event.target.value, tz_format: TIME_ZONES[event.target.value] })); + updateFormValue(event); }; return ( From e28794c77a683aa9d3cb0bc4ada9bb8dc79f8f81 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Wed, 30 Oct 2024 16:50:48 +0100 Subject: [PATCH 3/4] 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); From 5f1fa3f59b9d3472ef8678a1e86bbbef19f9c1fd Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Wed, 30 Oct 2024 17:39:15 +0100 Subject: [PATCH 4/4] show dev releaseNotes --- interface/src/app/settings/Version.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/app/settings/Version.tsx b/interface/src/app/settings/Version.tsx index 9b9f8d79f..2855c8684 100644 --- a/interface/src/app/settings/Version.tsx +++ b/interface/src/app/settings/Version.tsx @@ -217,7 +217,7 @@ const Version = () => { {isDev ? LL.DEVELOPMENT() : LL.STABLE()}  (changelog)