Remove "types.h" and "pattern.h". Move all its content to the right header. Hide some of the enums to cpp files.

Author: PolarGoose

src/dlms_parser/apdu_handler.cpp

@@ -6,6 +6,22 @@
 
 namespace dlms_parser {
 
+enum DlmsCipherConstants : uint8_t {
+  DLMS_SYSTITLE_LENGTH = 8,
+  DLMS_FRAME_COUNTER_LENGTH = 4,
+  DLMS_IV_LENGTH = 12,
+  DLMS_GCM_TAG_LENGTH = 12,
+  DLMS_LENGTH_SINGLE_BYTE_MAX = 127,
+  DLMS_LENGTH_CORRECTION = 5
+};
+
+enum DlmsApduTag : uint8_t {
+  DLMS_APDU_DATA_NOTIFICATION = 0x0F,
+  DLMS_APDU_GENERAL_BLOCK_TRANSFER = 0xE0,
+  DLMS_APDU_GENERAL_GLO_CIPHERING = 0xDB,
+  DLMS_APDU_GENERAL_DED_CIPHERING = 0xDF
+}; // There will be more, keep as list (not single line)
+
 static bool is_known_tag(const uint8_t b) {
   switch (b) {
   case DLMS_APDU_GENERAL_BLOCK_TRANSFER:

src/dlms_parser/axdr_parser.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include "pattern.h"
-#include "types.h"
 #include "utils.h"
 #include <cstdint>
 #include <functional>
@@ -11,6 +9,56 @@
 
 namespace dlms_parser {
 
+enum class AxdrTokenType : uint8_t {
+  EXPECT_TO_BE_FIRST,
+  EXPECT_TO_BE_LAST,
+  EXPECT_TYPE_EXACT,
+  EXPECT_TYPE_U_I_8,
+  EXPECT_CLASS_ID_UNTAGGED,
+  EXPECT_OBIS6_TAGGED,
+  EXPECT_OBIS6_TAGGED_WRONG,
+  EXPECT_OBIS6_UNTAGGED,
+  EXPECT_ATTR8_UNTAGGED,
+  EXPECT_VALUE_GENERIC,
+  EXPECT_VALUE_DATE_TIME,
+  EXPECT_VALUE_OCTET_STRING,
+  EXPECT_STRUCTURE_N,
+  EXPECT_SCALER_TAGGED,
+  EXPECT_UNIT_ENUM_TAGGED,
+  GOING_DOWN,
+  GOING_UP,
+  END_OF_PATTERN = 0xFF
+};
+
+struct AxdrPatternStep {
+  AxdrTokenType type{};
+  uint8_t param_u8_a{ 0 };
+};
+
+struct AxdrDescriptorPattern {
+  const char* name{ nullptr };
+  int priority{ 0 };
+  AxdrPatternStep steps[32]{};
+  uint16_t default_class_id{ 0 };
+  bool has_default_obis{ false };
+  std::array<uint8_t, 6> default_obis{};
+};
+
+struct AxdrCaptures {
+  uint32_t elem_idx{ 0 };
+  uint16_t class_id{ 0 };
+  std::span<const uint8_t> obis{};
+  DlmsDataType value_type{ DLMS_DATA_TYPE_NONE };
+  std::span<const uint8_t> value{};
+
+  bool has_scaler_unit{ false };
+  int8_t scaler{ 0 };
+  uint8_t unit_enum{ 0 };
+};
+
+// Callback: OBIS code, numeric value, string value, is_numeric flag
+using DlmsDataCallback = std::function<void(const char* obis_code, float float_val, const char* str_val, bool is_numeric)>;
+
 struct ParseResult {
   size_t count{ 0 };          // number of matched COSEM objects
   size_t bytes_consumed{ 0 }; // how many bytes of the input buffer were processed

src/dlms_parser/pattern.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "types.h"
 #include <cstddef>
 #include <cstdint>
 #include <span>
@@ -30,6 +29,33 @@ class NonCopyableAndNonMovable : NonCopyable {
   NonCopyableAndNonMovable& operator=(NonCopyableAndNonMovable&&) = delete;
 };
 
+enum DlmsDataType : uint8_t {
+  DLMS_DATA_TYPE_NONE = 0,
+  DLMS_DATA_TYPE_ARRAY = 1,
+  DLMS_DATA_TYPE_STRUCTURE = 2,
+  DLMS_DATA_TYPE_BOOLEAN = 3,
+  DLMS_DATA_TYPE_BIT_STRING = 4,
+  DLMS_DATA_TYPE_INT32 = 5,
+  DLMS_DATA_TYPE_UINT32 = 6,
+  DLMS_DATA_TYPE_OCTET_STRING = 9,
+  DLMS_DATA_TYPE_STRING = 10,
+  DLMS_DATA_TYPE_STRING_UTF8 = 12,
+  DLMS_DATA_TYPE_BINARY_CODED_DECIMAL = 13,
+  DLMS_DATA_TYPE_INT8 = 15,
+  DLMS_DATA_TYPE_INT16 = 16,
+  DLMS_DATA_TYPE_UINT8 = 17,
+  DLMS_DATA_TYPE_UINT16 = 18,
+  DLMS_DATA_TYPE_COMPACT_ARRAY = 19,
+  DLMS_DATA_TYPE_INT64 = 20,
+  DLMS_DATA_TYPE_UINT64 = 21,
+  DLMS_DATA_TYPE_ENUM = 22,
+  DLMS_DATA_TYPE_FLOAT32 = 23,
+  DLMS_DATA_TYPE_FLOAT64 = 24,
+  DLMS_DATA_TYPE_DATETIME = 25,
+  DLMS_DATA_TYPE_DATE = 26,
+  DLMS_DATA_TYPE_TIME = 27
+};
+
 inline uint16_t be16(const uint8_t* p) { return static_cast<uint16_t>(static_cast<unsigned>(p[0]) << 8 | p[1]); }
 inline uint32_t be32(const uint8_t* p) {
   return static_cast<uint32_t>(p[0]) << 24 | static_cast<uint32_t>(p[1]) << 16 |