github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-26 20:23:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved update and clearing of hour/day in data storage for graphs

Browse Source
This commit is contained in:
Gunnar Skjold
2023-05-02 13:39:16 +02:00
parent 259d8424a3
commit 9e5cb48101
5 changed files with 64 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/AmsToMqttBridge.cpp
View File

@@ -544,6 +544,15 @@ void loop() {
debugW_P(PSTR("Used %dms to read HAN port (false)"), millis()-start);
}
}
if(now - meterState.getLastUpdateMillis() > 3600000 && !ds.isHappy()) {
tmElements_t tm;
breakTime(now, tm);
if(tm.Minute == 0) {
AmsData nullData;
debugV_P(PSTR("Clearing data that have not been updated"));
ds.update(&nullData);
}
}
} catch(const std::exception& e) {
debugE_P(PSTR("Exception in readHanPort (%s)"), e.what());
meterState.setLastError(METER_ERROR_EXCEPTION);
@@ -1167,14 +1176,14 @@ void handleDataSuccess(AmsData* data) {
meterState.apply(*data);
bool saveData = false;
if(!ds.isHappy() && now > FirmwareVersion::BuildEpoch) {
if(!ds.isDayHappy() && now > FirmwareVersion::BuildEpoch) {
debugD_P(PSTR("Its time to update data storage"));
tmElements_t tm;
breakTime(now, tm);
if(tm.Minute == 0) {
debugV_P(PSTR(" using actual data"));
saveData = ds.update(data);
} else if(meterState.getListType() >= 3) {
} else if(tm.Minute == 1 && meterState.getListType() >= 3) {
debugV_P(PSTR(" using estimated data"));
saveData = ds.update(&meterState);
}