Initial changes for v2.3

lib/AmsDecoder/include/Cosem.h

@@ -1,3 +1,9 @@
+/**
+ * @copyright Utilitech AS 2023
+ * License: Fair Source
+ * 
+ */
+
 #ifndef _COSEM_H
 #define _COSEM_H
 

lib/AmsDecoder/include/DataParser.h

@@ -1,3 +1,9 @@
+/**
+ * @copyright Utilitech AS 2023
+ * License: Fair Source
+ * 
+ */
+
 #ifndef _DATAPASERSER_H
 #define _DATAPASERSER_H
 
@@ -10,6 +16,10 @@
 #define DATA_TAG_MBUS 0x68
 #define DATA_TAG_GBT 0xE0
 #define DATA_TAG_GCM 0xDB
+#define DATA_TAG_SNRM 0x81
+#define DATA_TAG_AARQ 0x60
+#define DATA_TAG_AARE 0x61
+#define DATA_TAG_RES 0xC4 // Get Response
 
 #define DATA_PARSE_OK 0
 #define DATA_PARSE_FAIL -1

lib/AmsDecoder/include/DataParsers.h

@@ -1,3 +1,9 @@
+/**
+ * @copyright Utilitech AS 2023
+ * License: Fair Source
+ * 
+ */
+
 #ifndef _DATAPASERSERS_H
 #define _DATAPASERSERS_H
 

lib/AmsDecoder/include/DlmsParser.h

@@ -1,3 +1,9 @@
+/**
+ * @copyright Utilitech AS 2023
+ * License: Fair Source
+ * 
+ */
+
 #ifndef _DLMSPARSER_H
 #define _DLMSPARSER_H
 

lib/AmsDecoder/include/DsmrParser.h

@@ -1,3 +1,9 @@
+/**
+ * @copyright Utilitech AS 2023
+ * License: Fair Source
+ * 
+ */
+
 #ifndef _DSMRPARSER_H
 #define _DSMRPARSER_H
 

lib/AmsDecoder/include/GbtParser.h

@@ -1,3 +1,9 @@
+/**
+ * @copyright Utilitech AS 2023
+ * License: Fair Source
+ * 
+ */
+
 #ifndef _GBTPARSER_H
 #define _GBTPARSER_H
 

lib/AmsDecoder/include/GcmParser.h

@@ -1,3 +1,9 @@
+/**
+ * @copyright Utilitech AS 2023
+ * License: Fair Source
+ * 
+ */
+
 #ifndef _GCMPARSER_H
 #define _GCMPARSER_H
 

lib/AmsDecoder/include/HdlcParser.h

@@ -1,3 +1,9 @@
+/**
+ * @copyright Utilitech AS 2023
+ * License: Fair Source
+ * 
+ */
+
 #ifndef _HDLCPARSER_H
 #define _HDLCPARSER_H
 

lib/AmsDecoder/include/LlcParser.h

@@ -1,3 +1,9 @@
+/**
+ * @copyright Utilitech AS 2023
+ * License: Fair Source
+ * 
+ */
+
 #ifndef _LLCPARSER_H
 #define _LLCPARSER_H
 

lib/AmsDecoder/include/MbusParser.h

@@ -1,3 +1,9 @@
+/**
+ * @copyright Utilitech AS 2023
+ * License: Fair Source
+ * 
+ */
+
 #ifndef _MBUSPARSER_H
 #define _MBUSPARSER_H
 

lib/AmsDecoder/include/crc.h

@@ -1,3 +1,9 @@
+/**
+ * @copyright Utilitech AS 2023
+ * License: Fair Source
+ * 
+ */
+
 #ifndef _CRC_H
 #define _CRC_H
 

lib/AmsDecoder/include/ntohll.h

@@ -1,3 +1,9 @@
+/**
+ * @copyright Utilitech AS 2023
+ * License: Fair Source
+ * 
+ */
+
 #ifndef _NTOHLL_H
 #define _NTOHLL_H
 

lib/AmsDecoder/src/Cosem.cpp

@@ -1,3 +1,9 @@
+/**
+ * @copyright Utilitech AS 2023
+ * License: Fair Source
+ * 
+ */
+
 #include "Cosem.h"
 #include "lwip/def.h"
 #include <TimeLib.h>

lib/AmsDecoder/src/DlmsParser.cpp

@@ -1,3 +1,9 @@
+/**
+ * @copyright Utilitech AS 2023
+ * License: Fair Source
+ * 
+ */
+
 #include "DlmsParser.h"
 #include "Cosem.h"
 

lib/AmsDecoder/src/DsmrParser.cpp

@@ -1,3 +1,9 @@
+/**
+ * @copyright Utilitech AS 2023
+ * License: Fair Source
+ * 
+ */
+
 #include "DsmrParser.h"
 #include "crc.h"
 #include "hexutils.h"

lib/AmsDecoder/src/GbtParser.cpp

@@ -1,3 +1,9 @@
+/**
+ * @copyright Utilitech AS 2023
+ * License: Fair Source
+ * 
+ */
+
 #include "GbtParser.h"
 #include "lwip/def.h"
 

lib/AmsDecoder/src/GcmParser.cpp

@@ -1,3 +1,9 @@
+/**
+ * @copyright Utilitech AS 2023
+ * License: Fair Source
+ * 
+ */
+
 #include "GcmParser.h"
 #include "lwip/def.h"
 #if defined(ESP8266)

lib/AmsDecoder/src/HdlcParser.cpp

@@ -1,3 +1,9 @@
+/**
+ * @copyright Utilitech AS 2023
+ * License: Fair Source
+ * 
+ */
+
 #include "HdlcParser.h"
 #include "lwip/def.h"
 #include "crc.h"
@@ -49,7 +55,10 @@ int8_t HDLCParser::parse(uint8_t *d, DataParserContext &ctx) {
         ptr += 3;
 
         // Exclude all of header and 3 byte footer
-        ctx.length -= ptr-d+3;
+        ctx.length -= ptr-d;
+        if(ctx.length > 1) {
+            ctx.length -= 3;
+        }
         return ptr-d;
     }
     return DATA_PARSE_UNKNOWN_DATA;

lib/AmsDecoder/src/LlcParser.cpp

@@ -1,3 +1,9 @@
+/**
+ * @copyright Utilitech AS 2023
+ * License: Fair Source
+ * 
+ */
+
 #include "LlcParser.h"
 
 int8_t LLCParser::parse(uint8_t *buf, DataParserContext &ctx) {

lib/AmsDecoder/src/MbusParser.cpp

@@ -1,3 +1,9 @@
+/**
+ * @copyright Utilitech AS 2023
+ * License: Fair Source
+ * 
+ */
+
 #include "MbusParser.h"
 
 int8_t MBUSParser::parse(uint8_t *d, DataParserContext &ctx) {

lib/AmsDecoder/src/crc.cpp

@@ -1,3 +1,9 @@
+/**
+ * @copyright Utilitech AS 2023
+ * License: Fair Source
+ * 
+ */
+
 #include "crc.h"
 
 uint16_t crc16_x25(const uint8_t* p, int len)

lib/AmsDecoder/src/ntohll.cpp

@@ -1,3 +1,9 @@
+/**
+ * @copyright Utilitech AS 2023
+ * License: Fair Source
+ * 
+ */
+
 #include "ntohll.h"
 
 uint64_t ntohll(uint64_t x) {