github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-02-06 00:25:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for meters with clock skew

Browse Source
This commit is contained in:
Gunnar Skjold
2024-07-03 09:22:09 +02:00
parent a1bbcc20e3
commit 1d91416348
3 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/AmsToMqttBridge.cpp
View File

@@ -858,7 +858,7 @@ void loop() {
debugW_P(PSTR("Used %dms to read HAN port (false)"), millis()-start);
}
}
if(millis() - meterState.getLastUpdateMillis() > 1800000 && !ds.isHappy()) {
if(millis() - meterState.getLastUpdateMillis() > 1800000 && !ds.isHappy(time(nullptr))) {
handleClear(now);
}
} catch(const std::exception& e) {
@@ -1367,7 +1367,7 @@ void handleDataSuccess(AmsData* data) {
rtp.update(meterState);
bool saveData = false;
if(!ds.isHappy() && now > FirmwareVersion::BuildEpoch) { // Must use "isHappy()" in case day state gets reset and lastTimestamp is "now"
if(!ds.isHappy(now) && now > FirmwareVersion::BuildEpoch) { // Must use "isHappy()" in case day state gets reset and lastTimestamp is "now"
tmElements_t tm, mtm;
breakTime(now, tm);
breakTime(meterTime, mtm);