Merge pull request #2315 from MichaelDvP/dev

fix thermostat clock year, #2313
emsesp · Dec 30, 2024 · 747a64b · 747a64b
2 parents ba3ae5e + 7c2e556
commit 747a64b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md
@@ -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)
 - 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)
+- thermostat date [#2313](https://github.com/emsesp/EMS-ESP32/issues/2313)
 
 ## Changed
 

diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp
@@ -1649,7 +1649,7 @@ void Thermostat::process_RCTime(std::shared_ptr<const Telegram> telegram) {
 
     // render date to DD.MM.YYYY HH:MM and publish
     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_));
 
     bool   ivtclock     = (telegram->message_data[0] & 0x80) == 0x80; // dont sync ivt-clock, #439

diff --git a/src/version.h b/src/version.h
@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.7.2-dev.6"
+#define EMSESP_APP_VERSION "3.7.2-dev.7"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define EMSESP_APP_VERSION "3.7.2-dev.6"
		#define EMSESP_APP_VERSION "3.7.2-dev.7"