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

Merge pull request #2315 from MichaelDvP/dev

Browse Source 
fix thermostat clock year, #2313
This commit is contained in:
Proddy
2024-12-30 21:27:04 +01:00
committed by GitHub
parent ba3ae5ea56 7c2e5560bd
commit 747a64b869
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG_LATEST.md
View File

@@ -22,6 +22,7 @@ For more details go to [docs.emsesp.org](https://docs.emsesp.org/).
- info command for devices without entity-commands [#2274](https://github.com/emsesp/EMS-ESP32/issues/2274) - info command for devices without entity-commands [#2274](https://github.com/emsesp/EMS-ESP32/issues/2274)
- CW100 settings telegram 0x241 [#2290](https://github.com/emsesp/EMS-ESP32/issues/2290) - CW100 settings telegram 0x241 [#2290](https://github.com/emsesp/EMS-ESP32/issues/2290)
- modbus signed 8bit values [#2294](https://github.com/emsesp/EMS-ESP32/issues/2294) - modbus signed 8bit values [#2294](https://github.com/emsesp/EMS-ESP32/issues/2294)
- thermostat date [#2313](https://github.com/emsesp/EMS-ESP32/issues/2313)
## Changed ## Changed

2
src/devices/thermostat.cpp
View File

@@ -1649,7 +1649,7 @@ void Thermostat::process_RCTime(std::shared_ptr<const Telegram> telegram) {
// render date to DD.MM.YYYY HH:MM and publish // render date to DD.MM.YYYY HH:MM and publish
char newdatetime[sizeof(dateTime_)]; char newdatetime[sizeof(dateTime_)];
strftime(newdatetime, sizeof(dateTime_), "%d.%m.%G %H:%M", tm_); strftime(newdatetime, sizeof(dateTime_), "%d.%m.%Y %H:%M", tm_);
has_update(dateTime_, newdatetime, sizeof(dateTime_)); has_update(dateTime_, newdatetime, sizeof(dateTime_));
bool ivtclock = (telegram->message_data[0] & 0x80) == 0x80; // dont sync ivt-clock, #439 bool ivtclock = (telegram->message_data[0] & 0x80) == 0x80; // dont sync ivt-clock, #439

2
src/version.h
View File

@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.7.2-dev.6" #define EMSESP_APP_VERSION "3.7.2-dev.7"