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

Increased range for counters in data storage

Browse Source
This commit is contained in:
Gunnar Skjold 2024-03-21 13:39:14 +01:00
parent 9efdf1daa5
commit 26a63e30e0
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/AmsDataStorage/include/AmsDataStorage.h
View File

@ -15,20 +15,20 @@ struct DayDataPoints {
uint8_t version;
uint16_t hImport[24];
time_t lastMeterReadTime;
uint32_t activeImport;
uint32_t activeExport;
uint64_t activeImport;
uint16_t hExport[24];
uint8_t accuracy;
}; // 113 bytes
uint64_t activeExport;
};
struct MonthDataPoints {
uint8_t version;
uint16_t dImport[31];
time_t lastMeterReadTime;
uint32_t activeImport;
uint32_t activeExport;
uint64_t activeImport;
uint16_t dExport[31];
uint8_t accuracy;
uint64_t activeExport;
}; // 142 bytes
class AmsDataStorage {

22
lib/AmsDataStorage/src/AmsDataStorage.cpp
View File

@ -11,9 +11,9 @@
#include "FirmwareVersion.h"
AmsDataStorage::AmsDataStorage(RemoteDebug* debugger) {
day.version = 5;
day.version = 6;
day.accuracy = 1;
month.version = 6;
month.version = 7;
month.accuracy = 1;
this->debugger = debugger;
}
@ -48,8 +48,8 @@ bool AmsDataStorage::update(AmsData* data) {
breakTime(now-3600, utcYesterday);
breakTime(tz->toLocal(now-3600), ltzYesterDay);
uint32_t importCounter = data->getActiveImportCounter() * 1000;
uint32_t exportCounter = data->getActiveExportCounter() * 1000;
uint64_t importCounter = data->getActiveImportCounter() * 1000;
uint64_t exportCounter = data->getActiveExportCounter() * 1000;
// Clear hours between last update and now
if(day.lastMeterReadTime > now) {
@ -381,6 +381,13 @@ bool AmsDataStorage::load() {
char buf[file.size()];
file.readBytes(buf, file.size());
DayDataPoints* day = (DayDataPoints*) buf;
if(day->version < 6) {
uint32_t counters[2];
memcpy((uint8_t*) counters, (uint8_t*) &day->activeImport, 8);
day->activeImport = counters[0];
day->activeExport = counters[1];
day->version = 6;
}
file.close();
ret = setDayData(*day);
}
@ -390,6 +397,13 @@ bool AmsDataStorage::load() {
char buf[file.size()];
file.readBytes(buf, file.size());
MonthDataPoints* month = (MonthDataPoints*) buf;
if(month->version < 6) {
uint32_t counters[2];
memcpy((uint8_t*) counters, (uint8_t*) &month->activeImport, 8);
month->activeImport = counters[0];
month->activeExport = counters[1];
month->version = 7;
}
file.close();
ret = ret && setMonthData(*month);
}