github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-13 15:37:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjustments to data storage update

Browse Source
This commit is contained in:
Gunnar Skjold 2022-02-12 19:54:11 +01:00
parent 0c1d666afd
commit f8a86058a1
3 changed files with 55 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/AmsDataStorage.cpp
View File

@ -102,7 +102,7 @@ bool AmsDataStorage::update(AmsData* data) {
bool ret = false;
// Update day plot
if(ltz.Minute > 0) {
if(!isDayHappy()) {
if(day.activeImport == 0 || now - day.lastMeterReadTime > 86400) {
day.activeImport = data->getActiveImportCounter() * 1000;
day.activeExport = data->getActiveExportCounter() * 1000;
@ -159,7 +159,7 @@ bool AmsDataStorage::update(AmsData* data) {
}
// Update month plot
if(ltz.Hour == 0) {
if(ltz.Hour == 0 && !isMonthHappy()) {
if(month.activeImport == 0 || now - month.lastMeterReadTime > 2678400) {
month.activeImport = data->getActiveImportCounter() * 1000;
month.activeExport = data->getActiveExportCounter() * 1000;
@ -333,21 +333,56 @@ bool AmsDataStorage::setMonthData(MonthDataPoints& month) {
}
bool AmsDataStorage::isHappy() {
return isDayHappy() && isMonthHappy();
}
bool AmsDataStorage::isDayHappy() {
time_t now = time(nullptr);
if(now < BUILD_EPOCH) return false;
tmElements_t tm, last;
if(now < day.lastMeterReadTime) return false;
if(now-day.lastMeterReadTime > 3600) return false;
breakTime(now, tm);
breakTime(day.lastMeterReadTime, last);
if(tm.Hour > last.Hour) return false;
if(now < month.lastMeterReadTime) return false;
if(now-month.lastMeterReadTime > 86400) return false;
breakTime(now, tm);
breakTime(month.lastMeterReadTime, last);
if(tm.Day > last.Day) return false;
if(now < day.lastMeterReadTime) {
if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(AmsDataStorage) Day %lu < %lu\n", now, day.lastMeterReadTime);
return false;
}
if(now-day.lastMeterReadTime > 3600) {
if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(AmsDataStorage) Day %lu - %lu > 3600\n", now, day.lastMeterReadTime);
return false;
}
breakTime(tz->toLocal(now), tm);
breakTime(tz->toLocal(day.lastMeterReadTime), last);
if(tm.Hour > last.Hour) {
if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(AmsDataStorage) Day %d > %d\n", tm.Hour, last.Hour);
return false;
}
return true;
}
bool AmsDataStorage::isMonthHappy() {
if(tz == NULL) {
if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(AmsDataStorage) Timezone is missing\n");
return false;
}
time_t now = time(nullptr);
if(now < BUILD_EPOCH) return false;
tmElements_t tm, last;
if(now < month.lastMeterReadTime) {
if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(AmsDataStorage) Month %lu < %lu\n", now, month.lastMeterReadTime);
return false;
}
if(now-month.lastMeterReadTime > 86400) {
if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(AmsDataStorage) Month %lu - %lu > 3600\n", now, month.lastMeterReadTime);
return false;
}
breakTime(tz->toLocal(now), tm);
breakTime(tz->toLocal(month.lastMeterReadTime), last);
if(tm.Day > last.Day) {
if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(AmsDataStorage) Month %d > %d\n", tm.Day, last.Day);
return false;
}
return true;
}

2
src/AmsDataStorage.h
View File

@ -37,6 +37,8 @@ public:
bool setMonthData(MonthDataPoints&);
bool isHappy();
bool isDayHappy();
bool isMonthHappy();
private:
Timezone* tz;

7
src/AmsToMqttBridge.ino
View File

@ -914,15 +914,18 @@ bool readHanPort() {
bool saveData = false;
if(!ds.isHappy() && now > BUILD_EPOCH) {
debugD("Its time to update data storage");
tmElements_t tm;
breakTime(now, tm);
if(tm.Minute == 0) {
debugD(" using actual data");
saveData = ds.update(&data);
} else if(tm.Minute == 1) {
} else if(meterState.getListType() >= 3) {
debugD(" using estimated data");
saveData = ds.update(&meterState);
}
if(saveData) {
debugI("Saving day plot");
debugI("Saving data");
ds.save();
}
}