mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9774 from s-hadinger/start_valid_time 

Use START_VALID_TIME
This commit is contained in:
s-hadinger 2020-11-08 10:14:16 +01:00 committed by GitHub
parent 2987540e21 6d0d923163
commit 327ca0aa85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasmota/xdrv_23_zigbee_2a_devices_impl.ino
View File

@ -315,7 +315,7 @@ void Z_Device::setLastSeenNow(void) {
// Fixes issue where zigbee device pings before WiFi/NTP has set utc_time // Fixes issue where zigbee device pings before WiFi/NTP has set utc_time
// to the correct time, and "last seen" calculations are based on the // to the correct time, and "last seen" calculations are based on the
// pre-corrected last_seen time and the since-corrected utc_time. // pre-corrected last_seen time and the since-corrected utc_time.
if (Rtc.utc_time < 1577836800) { return; } if (Rtc.utc_time < START_VALID_TIME) { return; }
last_seen = Rtc.utc_time; last_seen = Rtc.utc_time;
} }

6
tasmota/xdrv_23_zigbee_8_parsers.ino
View File

@ -1949,19 +1949,19 @@ void ZCLFrame::autoResponder(const uint16_t *attr_list_ids, size_t attr_len) {
break; break;
#endif #endif
case 0x000A0000: // Time case 0x000A0000: // Time
attr.setUInt((Rtc.utc_time > (60 * 60 * 24 * 365 * 10)) ? Rtc.utc_time - 946684800 : Rtc.utc_time); attr.setUInt((Rtc.utc_time > START_VALID_TIME) ? Rtc.utc_time - 946684800 : Rtc.utc_time);
break; break;
case 0x000AFF00: // TimeEpoch - Tasmota specific case 0x000AFF00: // TimeEpoch - Tasmota specific
attr.setUInt(Rtc.utc_time); attr.setUInt(Rtc.utc_time);
break; break;
case 0x000A0001: // TimeStatus case 0x000A0001: // TimeStatus
attr.setUInt((Rtc.utc_time > (60 * 60 * 24 * 365 * 10)) ? 0x02 : 0x00); // if time is beyond 2010 then we are synchronized attr.setUInt((Rtc.utc_time > START_VALID_TIME) ? 0x02 : 0x00);
break; break;
case 0x000A0002: // TimeZone case 0x000A0002: // TimeZone
attr.setUInt(Settings.toffset[0] * 60); attr.setUInt(Settings.toffset[0] * 60);
break; break;
case 0x000A0007: // LocalTime // TODO take DST case 0x000A0007: // LocalTime // TODO take DST
attr.setUInt(Settings.toffset[0] * 60 + ((Rtc.utc_time > (60 * 60 * 24 * 365 * 10)) ? Rtc.utc_time - 946684800 : Rtc.utc_time)); attr.setUInt(Settings.toffset[0] * 60 + ((Rtc.utc_time > START_VALID_TIME) ? Rtc.utc_time - 946684800 : Rtc.utc_time));
break; break;
} }
if (!attr.isNone()) { if (!attr.isNone()) {