* Add OBIS which was missing for Lithuania meters

geduxas · PolarGoose · commit b09ba9e8c3f4 · 2026-02-24T14:24:11.000+01:00
* Add negative value support
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,8 +34,8 @@ target_include_directories(bearssl SYSTEM PUBLIC "${bearsll_SOURCE_DIR}/inc" PRI
 # cmake_template for warnings and sanitizers
 FetchContent_Populate(
   cmake_template
-  URL https://github.com/cpp-best-practices/cmake_template/archive/1015c6b88410df411c0cc0413e3e64c33d7a8331.zip
-  URL_HASH SHA512=b7ad5b05eb21e5cb8159f3bd8b05615ee55489e5ab6a543bfe50ba05c8c8935106a6870b438c97ca3894108650a4a542a810707954cbe6b3beb9c6de82f1bde7)
+  URL https://github.com/cpp-best-practices/cmake_template/archive/0a32e3ff530534f04d7a73817d563bb26eea1b5a.zip
+  URL_HASH SHA512=4cab8e5f75054b46c131447e0b9b4f36239eed7c8e5c3a01a09f1454126ea4fc24a5426a4662966cd925673f25383220a56644cab7551cb70aa40870e4577c0b)
 include(${cmake_template_SOURCE_DIR}/cmake/CompilerWarnings.cmake)
 include(${cmake_template_SOURCE_DIR}/cmake/Sanitizers.cmake)
 
diff --git a/specs/eso.lt energy provider Lithuania.pdf b/specs/eso.lt energy provider Lithuania.pdf
diff --git a/src/dsmr_parser/fields.h b/src/dsmr_parser/fields.h
@@ -56,9 +56,9 @@ struct TimestampField : StringField<T, 13, 13> {};
 struct FixedValue {
   operator float() const noexcept { return val(); }
   float val() const noexcept { return static_cast<float>(_value) / 1000.0f; }
-  uint32_t int_val() const noexcept { return _value; }
+  int32_t int_val() const noexcept { return _value; }
 
-  uint32_t _value;
+  int32_t _value;
 };
 
 // Floating point numbers in the message never have more than 3 decimal
@@ -132,7 +132,7 @@ struct LastFixedField : public FixedField<T, _unit, _int_unit> {
 template <typename T, const char* _unit>
 struct IntField : ParsedField<T> {
   ParseResult<void> parse(const char* str, const char* end) {
-    ParseResult<uint32_t> res = NumParser::parse(0, _unit, str, end);
+    ParseResult<int32_t> res = NumParser::parse(0, _unit, str, end);
     if (!res.err) {
       auto& dst = static_cast<T*>(this)->val();
       using Dst = std::remove_reference_t<decltype(dst)>;
@@ -174,10 +174,10 @@ struct AveragedFixedField : public FixedField<T, _unit, _int_unit> {
     if (res.err)
       return res;
 
-    ParseResult<uint32_t> average;
-    average.succeed(0u);
+    ParseResult<int32_t> average;
+    average.succeed(0);
     average.next = res.next;
-    for (uint32_t i = 0; i < numberOfValues.result; i++) {
+    for (int32_t i = 0; i < numberOfValues.result; i++) {
       // skip date (230201000000W)
       res = StringParser::parse_string(1, 20, average.next, end);
       if (res.err)
@@ -482,8 +482,7 @@ DEFINE_FIELD(apparent_return_power_l3, FixedValue, ObisId(1, 0, 70, 7, 0), Fixed
 // Active Demand Avg3 Plus in W resolution
 DEFINE_FIELD(active_demand_power, FixedValue, ObisId(1, 0, 1, 24, 0), FixedField, units::kW, units::W);
 // Active Demand Avg3 Net in W resolution
-// TODO: 1-0.16.24.0.255 can have negative value, this library is not ready for negative numbers.
-// DEFINE_FIELD(active_demand_net, int32_t, ObisId(1, 0, 16, 24, 0), IntField, units::kW);
+DEFINE_FIELD(active_demand_net, FixedValue, ObisId(1, 0, 16, 24, 0), FixedField, units::kW, units::W);
 // Active Demand Avg3 Absolute  in W resolution
 DEFINE_FIELD(active_demand_abs, FixedValue, ObisId(1, 0, 15, 24, 0), FixedField, units::kW, units::W);
 
@@ -572,5 +571,17 @@ DEFINE_FIELD(fw_core_checksum, std::string, ObisId(1, 0, 0, 2, 8), StringField,
 DEFINE_FIELD(fw_module_version, std::string, ObisId(1, 1, 0, 2, 0), StringField, 0, 96);
 DEFINE_FIELD(fw_module_checksum, std::string, ObisId(1, 1, 0, 2, 8), StringField, 0, 96);
 
+// Instantaneous power factor
+DEFINE_FIELD(power_factor, FixedValue, ObisId(1, 0, 13, 7, 0), FixedField, units::none, units::none);
+// Instantaneous power factor in phase L1, L2, L3
+DEFINE_FIELD(power_factor_l1, FixedValue, ObisId(1, 0, 33, 7, 0), FixedField, units::none, units::none);
+DEFINE_FIELD(power_factor_l2, FixedValue, ObisId(1, 0, 53, 7, 0), FixedField, units::none, units::none);
+DEFINE_FIELD(power_factor_l3, FixedValue, ObisId(1, 0, 73, 7, 0), FixedField, units::none, units::none);
+// Minimum Power factor
+DEFINE_FIELD(min_power_factor, FixedValue, ObisId(1, 0, 13, 3, 0), FixedField, units::none, units::none);
+
+// Measurement Period 3 for Instantaneous values
+DEFINE_FIELD(period_3_for_instantaneous_values, uint32_t, ObisId(1, 0, 0, 8, 2), IntField, units::s);
+
 }
 }
diff --git a/src/dsmr_parser/parser.h b/src/dsmr_parser/parser.h
@@ -105,7 +105,7 @@ static constexpr char INVALID_NUMBER[] = "Invalid number";
 static constexpr char INVALID_UNIT[] = "Invalid unit";
 
 struct NumParser final {
-  static ParseResult<uint32_t> parse_float_or_int(const size_t max_decimals, const char* float_unit, const char* int_unit, const char* str, const char* end) {
+  static ParseResult<int32_t> parse_float_or_int(const size_t max_decimals, const char* float_unit, const char* int_unit, const char* str, const char* end) {
     auto float_res = NumParser::parse(max_decimals, float_unit, str, end);
     if (!float_res.err)
       return float_res;
@@ -117,36 +117,41 @@ struct NumParser final {
     return float_res;
   }
 
-  static ParseResult<uint32_t> parse(size_t max_decimals, const char* unit, const char* str, const char* end) {
-    ParseResult<uint32_t> res;
+  static ParseResult<int32_t> parse(size_t max_decimals, const char* unit, const char* str, const char* end) {
+    ParseResult<int32_t> res;
     if (str >= end || *str != '(')
       return res.fail("Missing (", str);
 
-    const char* num_start = str + 1; // Skip (
-    const char* num_end = num_start;
+    const char* cur_symbol = str + 1; // Skip (
 
-    uint32_t value = 0;
+    bool negative = false;
+    if (cur_symbol < end && *cur_symbol == '-') {
+      negative = true;
+      ++cur_symbol;
+    }
+
+    int32_t value = 0;
 
     // Parse integer part
-    while (num_end < end && !strchr("*.)", *num_end)) {
-      if (*num_end < '0' || *num_end > '9')
-        return res.fail(INVALID_NUMBER, num_end);
+    while (cur_symbol < end && !strchr("*.)", *cur_symbol)) {
+      if (*cur_symbol < '0' || *cur_symbol > '9')
+        return res.fail(INVALID_NUMBER, cur_symbol);
       value *= 10;
-      value += static_cast<uint32_t>(*num_end - '0');
-      ++num_end;
+      value += (*cur_symbol - '0');
+      ++cur_symbol;
     }
 
     // Parse decimal part, if any
-    if (max_decimals && num_end < end && *num_end == '.') {
-      ++num_end;
+    if (max_decimals && cur_symbol < end && *cur_symbol == '.') {
+      ++cur_symbol;
 
-      while (num_end < end && !strchr("*)", *num_end) && max_decimals) {
+      while (cur_symbol < end && !strchr("*)", *cur_symbol) && max_decimals) {
         max_decimals--;
-        if (*num_end < '0' || *num_end > '9')
-          return res.fail(INVALID_NUMBER, num_end);
+        if (*cur_symbol < '0' || *cur_symbol > '9')
+          return res.fail(INVALID_NUMBER, cur_symbol);
         value *= 10;
-        value += static_cast<uint32_t>(*num_end - '0');
-        ++num_end;
+        value += (*cur_symbol - '0');
+        ++cur_symbol;
       }
     }
 
@@ -156,30 +161,32 @@ struct NumParser final {
 
     // Workaround for https://github.com/matthijskooijman/arduino-dsmr/issues/50
     // If value is 0, then we allow missing unit.
-    if (unit && *unit && (num_end >= end || (*num_end != '*' && *num_end != '.')) && value == 0) {
-      num_end = std::find(num_end, end, ')');
+    if (unit && *unit && (cur_symbol >= end || (*cur_symbol != '*' && *cur_symbol != '.')) && value == 0) {
+      cur_symbol = std::find(cur_symbol, end, ')');
     }
 
-    // If a unit was passed, check that the unit in the messages
-    // messages the unit passed.
+    // If a unit was passed, check that the unit in the message matches the unit passed.
     else if (unit && *unit) {
-      if (num_end >= end || *num_end != '*')
-        return res.fail("Missing unit", num_end);
-      const char* unit_start = ++num_end; // skip *
-      while (num_end < end && *num_end != ')' && *unit) {
+      if (cur_symbol >= end || *cur_symbol != '*')
+        return res.fail("Missing unit", cur_symbol);
+      const char* unit_start = ++cur_symbol; // skip *
+      while (cur_symbol < end && *cur_symbol != ')' && *unit) {
         // Next character in units do not match?
-        if (std::tolower(static_cast<unsigned char>(*num_end++)) != std::tolower(static_cast<unsigned char>(*unit++)))
+        if (std::tolower(static_cast<unsigned char>(*cur_symbol++)) != std::tolower(static_cast<unsigned char>(*unit++)))
           return res.fail(INVALID_UNIT, unit_start);
       }
       // At the end of the message unit, but not the passed unit?
       if (*unit)
         return res.fail(INVALID_UNIT, unit_start);
     }
 
-    if (num_end >= end || *num_end != ')')
-      return res.fail("Extra data", num_end);
+    if (cur_symbol >= end || *cur_symbol != ')')
+      return res.fail("Extra data", cur_symbol);
+
+    if (negative)
+      value = -value;
 
-    return res.succeed(value).until(num_end + 1); // Skip )
+    return res.succeed(value).until(cur_symbol + 1); // Skip )
   }
 };
 
diff --git a/tests/parser_test.cpp b/tests/parser_test.cpp
@@ -49,7 +49,14 @@ TEST_CASE("Should parse all fields in the DSMR message correctly") {
                     "1-1:0.2.0((ER12)\r\n"
                     "1-1:0.2.8(ER13))\r\n"
                     "0-1:24.4.0(1)\r\n"
-                    "!96c9\r\n";
+                    "1-0:16.24.0(-03.618*kW)\r\n"
+                    "1-0:13.7.0(0.998)\r\n"
+                    "1-0:33.7.0(0.975)\r\n"
+                    "1-0:53.7.0(0.963)\r\n"
+                    "1-0:73.7.0(0.987)\r\n"
+                    "1-0:13.3.0(0.000)\r\n"
+                    "1-0:0.8.2(00900*s)\r\n"
+                    "!\r\n";
 
   ParsedData<
       /* String */ identification,
@@ -104,10 +111,17 @@ TEST_CASE("Should parse all fields in the DSMR message correctly") {
       /* String */ fw_core_version,
       /* String */ fw_core_checksum,
       /* String */ fw_module_version,
-      /* String */ fw_module_checksum>
+      /* String */ fw_module_checksum,
+      /* FixedValue */ active_demand_net,
+      /* FixedValue */ power_factor,
+      /* FixedValue */ power_factor_l1,
+      /* FixedValue */ power_factor_l2,
+      /* FixedValue */ power_factor_l3,
+      /* FixedValue */ min_power_factor,
+      /* FixedValue */ period_3_for_instantaneous_values>
       data;
 
-  auto res = P1Parser::parse(data, msg, std::size(msg), true);
+  auto res = P1Parser::parse(data, msg, std::size(msg), /* unknown_error */ true, /* check_crc */ false);
   REQUIRE(res.err == nullptr);
 
   // Print all values
@@ -146,6 +160,29 @@ TEST_CASE("Should parse all fields in the DSMR message correctly") {
   REQUIRE(data.fw_core_checksum == "1.0.smth smth-123");
   REQUIRE(data.fw_module_version == "(ER12");
   REQUIRE(data.fw_module_checksum == "ER13)");
+  REQUIRE(data.active_demand_net == -3.618f);
+  REQUIRE(data.power_factor == 0.998f);
+  REQUIRE(data.power_factor_l1 == 0.975f);
+  REQUIRE(data.power_factor_l2 == 0.963f);
+  REQUIRE(data.power_factor_l3 == 0.987f);
+  REQUIRE(data.min_power_factor == 0.0f);
+  REQUIRE(data.period_3_for_instantaneous_values == 900);
+}
+
+TEST_CASE("Should calculate CRC correctly") {
+  const auto& msg = "/KFM5KAIFA-METER\r\n"
+                    "\r\n"
+                    "1-0:1.8.1(000671.578*kWh)\r\n"
+                    "1-0:1.7.0(00.318*kW)\r\n"
+                    "!1e1D\r\n";
+
+  ParsedData<
+      /* String */ identification,
+      /* FixedValue */ power_delivered>
+      data;
+
+  auto res = P1Parser::parse(data, msg, std::size(msg), /* unknown_error */ false, /* check_crc */ true);
+  REQUIRE(res.err == nullptr);
 }
 
 TEST_CASE("Should report an error if the crc has incorrect format") {
