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

Fixed timestamp bug

Browse Source
This commit is contained in:
Gunnar Skjold
2025-01-09 15:35:22 +01:00
parent 067aa0c6cb
commit 1d4e7e564d
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/AmsDecoder/include/Cosem.h
View File

@@ -19,6 +19,7 @@ enum CosemType {
CosemTypeString = 0x0A, CosemTypeString = 0x0A,
CosemTypeDLongSigned = 0x05, CosemTypeDLongSigned = 0x05,
CosemTypeDLongUnsigned = 0x06, CosemTypeDLongUnsigned = 0x06,
CosemTypeSigned = 0x0F,
CosemTypeLongSigned = 0x10, CosemTypeLongSigned = 0x10,
CosemTypeUnsigned = 0x11, CosemTypeUnsigned = 0x11,
CosemTypeLongUnsigned = 0x12, CosemTypeLongUnsigned = 0x12,

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

@@ -740,6 +740,8 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, MeterConfig* meterCo
meterTimestamp = tz.toUTC(ts); meterTimestamp = tz.toUTC(ts);
} else if(meterType == AmsTypeAidon) { } else if(meterType == AmsTypeAidon) {
meterTimestamp = ts - 3600; // 21.09.24, the clock is now correct meterTimestamp = ts - 3600; // 21.09.24, the clock is now correct
} else {
meterTimestamp = ts;
} }
} }