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

Fixed Kamstrup bug

Browse Source
This commit is contained in:
Gunnar Skjold
2021-11-17 20:42:45 +01:00
parent 24025d6785
commit 2a524cd0ac
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ams/hdlc.cpp
View File

@@ -8,8 +8,6 @@
#include "mbedtls/gcm.h"
#endif
int wtf = 48;
void mbus_hexdump(const uint8_t* buf, int len) {
printf("\nDUMP (%db) [ ", len);
for(const uint8_t* p = buf; p-buf < len; ++p)
@@ -76,11 +74,14 @@ int HDLC_validate(const uint8_t* d, int len, HDLCConfig* config) {
ptr += sizeof *adpu;
// ADPU timestamp
// TODO : extract and return
CosemData* dateTime = (CosemData*) ptr;
if(dateTime->base.type == CosemTypeOctetString)
if(dateTime->base.type == CosemTypeOctetString) {
ptr += 2 + dateTime->base.length;
else if(dateTime->base.type == CosemTypeNull) {
} else if(dateTime->base.type == CosemTypeNull) {
ptr++;
} else if(dateTime->base.type == 0x0C) { // Kamstrup bug...
ptr += 13;
} else {
return -99;
}
@@ -133,6 +134,6 @@ int HDLC_validate(const uint8_t* d, int len, HDLCConfig* config) {
return ptr-d;
}
// No payload
// Unknown payload
return 0;
}