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 ( diff --git a/interface/src/app/settings/Version.tsx b/interface/src/app/settings/Version.tsx index c6aaa5827..2855c8684 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/'; @@ -211,7 +217,7 @@ const Version = () => { {isDev ? LL.DEVELOPMENT() : LL.STABLE()}  (changelog) 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 { 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);