andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-08 08:49:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2158 from MichaelDvP/dev

Browse Source 
small fixes, webinterface and log messages
This commit is contained in:
Proddy
2024-10-30 18:12:44 +01:00
committed by GitHub
parent 2df67c2d64 5f1fa3f59b
commit 30b7b6db34
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
interface/src/app/settings/NTPSettings.tsx
View File

@@ -71,12 +71,12 @@ const NTPSettings = () => {
}; };
const changeTimeZone = (event: React.ChangeEvent<HTMLInputElement>) => { const changeTimeZone = (event: React.ChangeEvent<HTMLInputElement>) => {
updateFormValue(event);
void updateState(readNTPSettings(), (settings: NTPSettingsType) => ({ void updateState(readNTPSettings(), (settings: NTPSettingsType) => ({
...settings, ...settings,
tz_label: event.target.value, tz_label: event.target.value,
tz_format: TIME_ZONES[event.target.value] tz_format: TIME_ZONES[event.target.value]
})); }));
updateFormValue(event);
}; };
return ( return (

10
interface/src/app/settings/Version.tsx
View File

@@ -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 // 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, // immediate: false,
// initialData: '3.6.5' // 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) // 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, // immediate: false,
// initialData: '3.7.0-dev.32' // initialData: '3.7.0-dev.32'
}).onSuccess((event) => { }).onSuccess((event) => {
void sendCheckUpgrade(event.data); if (useDev) {
void sendCheckUpgrade(event.data);
}
}); });
const STABLE_URL = 'https://github.com/emsesp/EMS-ESP32/releases/download/'; const STABLE_URL = 'https://github.com/emsesp/EMS-ESP32/releases/download/';
@@ -211,7 +217,7 @@ const Version = () => {
{isDev ? LL.DEVELOPMENT() : LL.STABLE()}&nbsp; {isDev ? LL.DEVELOPMENT() : LL.STABLE()}&nbsp;
<Link <Link
target="_blank" target="_blank"
href={useDev ? DEV_RELNOTES_URL : STABLE_RELNOTES_URL} href={isDev ? DEV_RELNOTES_URL : STABLE_RELNOTES_URL}
color="primary" color="primary"
> >
(changelog) (changelog)

3
src/devices/thermostat.cpp
View File

@@ -1605,10 +1605,11 @@ void Thermostat::process_RCTime(std::shared_ptr<const Telegram> telegram) {
if (setTimeRetry < 3) { if (setTimeRetry < 3) {
if (!use_dst) { if (!use_dst) {
set_datetime("ntp", 0); // set from NTP without dst set_datetime("ntp", 0); // set from NTP without dst
LOG_INFO("thermostat time correction from ntp, ignoring dst");
} else { } else {
set_datetime("ntp", -1); // set from NTP set_datetime("ntp", -1); // set from NTP
LOG_INFO("thermostat time correction from ntp");
} }
LOG_INFO("thermostat time correction from ntp");
setTimeRetry++; setTimeRetry++;
} }
} else { } else {

2
src/web/WebStatusService.cpp
View File

@@ -208,7 +208,7 @@ bool WebStatusService::checkUpgrade(JsonObject root, std::string & latest_versio
if (!latest_version.empty()) { if (!latest_version.empty()) {
#if defined(EMSESP_DEBUG) #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 #endif
version::Semver200_version settings_version(EMSESP_APP_VERSION); version::Semver200_version settings_version(EMSESP_APP_VERSION);