github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-05-03 22:59:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some changes to data update

Browse Source
This commit is contained in:
Gunnar Skjold
2024-09-21 13:00:22 +02:00
parent ada57b1052
commit 0b342d6c49
1 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/AmsToMqttBridge.cpp
View File

@@ -1363,28 +1363,31 @@ void handleDataSuccess(AmsData* data) {
meterState.apply(*data); meterState.apply(*data);
rtp.update(meterState); rtp.update(meterState);
time_t dataUpdateTime = now;
if(abs(now - meterTime) < 300) {
dataUpdateTime = meterTime;
}
tmElements_t tm, mtm;
breakTime(now, tm);
breakTime(meterTime, mtm);
bool saveData = false; bool saveData = false;
if(!ds.isHappy(now) && now > FirmwareVersion::BuildEpoch) { // Must use "isHappy()" in case day state gets reset and lastTimestamp is "now" if(!ds.isHappy(dataUpdateTime) && dataUpdateTime > FirmwareVersion::BuildEpoch) { // Must use "isHappy()" in case day state gets reset and lastTimestamp is "now"
tmElements_t tm, mtm; debugD_P(PSTR("READY to update (internal clock %02d:%02d:%02d UTC, meter clock: %02d:%02d:%02d, list type %d, est: %d, using clock: %d)"), tm.Hour, tm.Minute, tm.Second, mtm.Hour, mtm.Minute, mtm.Second, data->getListType(), wasCounterEstimated, dataUpdateTime == now);
breakTime(now, tm); tmElements_t dtm;
breakTime(meterTime, mtm); breakTime(dataUpdateTime, dtm);
if(!wasCounterEstimated) { // Assuming these type of meters report all data all the time if(dtm.Minute == 0 && data->getListType() >= 3) {
if(tm.Minute == 0 && data->getListType() == 3) { debugD_P(PSTR("Updating data storage using actual data"));
debugD_P(PSTR("Updating data storage (internal clock %02d:%02d:%02d UTC, meter clock: %02d:%02d:%02d)"), tm.Hour, tm.Minute, tm.Second, mtm.Hour, mtm.Minute, mtm.Second); saveData = ds.update(data, dataUpdateTime);
saveData = ds.update(data, now);
} #if defined(_CLOUDCONNECTOR_H)
} else if(data->getListType() == 3) { // Assuming HAN-NVE style meters which reports list type 3 only once per hour if(saveData && cloud != NULL) cloud->forceUpdate();
if(tm.Minute == 0) { #endif
debugD_P(PSTR("Updating data storage, triggered by internal clock %02d:%02d:%02d UTC (Meter clock: %02d:%02d:%02d)"), tm.Hour, tm.Minute, tm.Second, mtm.Hour, mtm.Minute, mtm.Second); } else if(dtm.Minute == 1) {
saveData = ds.update(data, now);
} else if(mtm.Minute == 0 && meterTime > FirmwareVersion::BuildEpoch) {
debugD_P(PSTR("Updating data storage, triggered by meter clock %02d:%02d:%02d UTC (Internal clock: %02d:%02d:%02d)"), mtm.Hour, mtm.Minute, mtm.Second, tm.Hour, tm.Minute, tm.Second);
saveData = ds.update(data, meterTime);
}
} else if(tm.Minute == 1) {
debugW_P(PSTR("Did not receive necessary data for previous hour, clearing")); debugW_P(PSTR("Did not receive necessary data for previous hour, clearing"));
AmsData nullData; AmsData nullData;
saveData = ds.update(&nullData, now); saveData = ds.update(&nullData, dataUpdateTime);
} }
if(saveData) { if(saveData) {
debugI_P(PSTR("Saving data")); debugI_P(PSTR("Saving data"));
@@ -1392,12 +1395,10 @@ void handleDataSuccess(AmsData* data) {
debugW_P(PSTR("Unable to save data storage")); debugW_P(PSTR("Unable to save data storage"));
} }
} }
} else {
debugD_P(PSTR("NOT Ready to update (internal clock %02d:%02d:%02d UTC, meter clock: %02d:%02d:%02d, list type %d, est: %d)"), tm.Hour, tm.Minute, tm.Second, mtm.Hour, mtm.Minute, mtm.Second, data->getListType(), wasCounterEstimated);
} }
#if defined(_CLOUDCONNECTOR_H)
if(saveData && cloud != NULL) cloud->forceUpdate();
#endif
if(ea.update(data)) { if(ea.update(data)) {
debugI_P(PSTR("Saving energy accounting")); debugI_P(PSTR("Saving energy accounting"));
if(!ea.save()) { if(!ea.save()) {