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

Adjustments of clock parsing from dlms

Browse Source
This commit is contained in:
Gunnar Skjold
2024-09-21 20:03:46 +02:00
parent 025c556626
commit af6ecc5d47
2 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/MeterCommunicators/src/IEC6205675.cpp
View File

@@ -404,10 +404,10 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, MeterConfig* meterCo
if(meterTs != NULL) {
AmsOctetTimestamp* amst = (AmsOctetTimestamp*) meterTs;
time_t ts = decodeCosemDateTime(amst->dt);
if(meterType == AmsTypeAidon || meterType == AmsTypeKamstrup) {
meterTimestamp = ts - 3600;
} else {
meterTimestamp = ts;
if(amst->dt.deviation == 0x8000) { // Deviation not specified, adjust from localtime to UTC
meterTimestamp = tz.toUTC(ts);
} else if(meterType == AmsTypeAidon) {
meterTimestamp = ts - 3600; // 21.09.24, the clock is now correct
}
}