diff --git a/CHANGELOG.md b/CHANGELOG.md index d1d06ab3d..e5f8753cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ All notable changes to this project will be documented in this file. ### Fixed - ESP32 shutter frequency (#19717) - ModbusBridge write memory leak (#19758) +- Zigbee fix timezone when device reads LocalTime attribute ### Removed - WiFiClientSecure in favour of WiFiClientSecureLightBearSSL (#19725) diff --git a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_8_parsers.ino b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_8_parsers.ino index 3efd52d91..e46d1eef6 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_8_parsers.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_8_parsers.ino @@ -2274,10 +2274,10 @@ void ZCLFrame::autoResponder(const uint16_t *attr_list_ids, size_t attr_len) { attr.setUInt((Rtc.utc_time > START_VALID_TIME) ? 0x02 : 0x00); break; case 0x000A0002: // TimeZone - attr.setUInt(Settings->toffset[0] * 60); + attr.setUInt(Rtc.time_timezone * 60); break; case 0x000A0007: // LocalTime // TODO take DST - attr.setUInt(Settings->toffset[0] * 60 + ((Rtc.utc_time > START_VALID_TIME) ? Rtc.utc_time - 946684800 : Rtc.utc_time)); + attr.setUInt(Rtc.time_timezone * 60 + ((Rtc.utc_time > START_VALID_TIME) ? Rtc.utc_time - 946684800 : Rtc.utc_time)); break; } if (!attr.isNone()) {