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

More adaptations for Austian meters

Browse Source
This commit is contained in:
Gunnar Skjold
2021-12-07 19:07:43 +01:00
parent 38cba4e8da
commit eb479f8216
6 changed files with 73 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/AmsDataStorage.cpp
View File

@@ -21,9 +21,16 @@ bool AmsDataStorage::update(AmsData* data) {
debugger->printf("(AmsDataStorage) Time is: %d\n", now);
}
if(now < EPOCH_2021_01_01) {
now = data->getMeterTimestamp();
if(debugger->isActive(RemoteDebug::DEBUG)) {
debugger->printf("(AmsDataStorage) Using meter timestamp, which is: %d\n", now);
if(data->getMeterTimestamp() > 0) {
now = data->getMeterTimestamp();
if(debugger->isActive(RemoteDebug::DEBUG)) {
debugger->printf("(AmsDataStorage) Using meter timestamp, which is: %d\n", now);
}
} else if(data->getPackageTimestamp() > 0) {
now = data->getPackageTimestamp();
if(debugger->isActive(RemoteDebug::DEBUG)) {
debugger->printf("(AmsDataStorage) Using package timestamp, which is: %d\n", now);
}
}
}
if(now-day.lastMeterReadTime < 3595) {