Fix Test for active_demand_net

geduxas · PolarGoose · commit a599bceb2f9c · 2026-02-23T18:01:58.000+01:00
Add PF obis fields
Add negative value support, add active_demand_net
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,12 @@ 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);
 
+/* Power Factor*/
+DEFINE_FIELD(power_factor, FixedValue, ObisId(1, 0, 13, 7, 0),FixedField, units::none, units::none);
+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);
+DEFINE_FIELD(min_power_factor, FixedValue, ObisId(1, 0, 13, 3, 0),FixedField, units::none, units::none);
+
 }
 }
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,22 +117,28 @@ 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;
 
-    uint32_t value = 0;
+    bool negative = false;
+    if (num_end < end && *num_end == '-') {
+      negative = true;
+      ++num_end;
+    }
+
+    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);
       value *= 10;
-      value += static_cast<uint32_t>(*num_end - '0');
+      value += (*num_end - '0');
       ++num_end;
     }
 
@@ -145,7 +151,7 @@ struct NumParser final {
         if (*num_end < '0' || *num_end > '9')
           return res.fail(INVALID_NUMBER, num_end);
         value *= 10;
-        value += static_cast<uint32_t>(*num_end - '0');
+        value += (*num_end - '0');
         ++num_end;
       }
     }
@@ -179,6 +185,8 @@ struct NumParser final {
     if (num_end >= end || *num_end != ')')
       return res.fail("Extra data", num_end);
 
+    if (negative) value = -value;
+
     return res.succeed(value).until(num_end + 1); // Skip )
   }
 };
diff --git a/src/dsmr_parser/util.h b/src/dsmr_parser/util.h
@@ -68,7 +68,7 @@ struct _ParseResult {
 
   template <class U>
   P& succeed(U&& value) {
-    result = std::forward<U>(value);
+    result = static_cast<T>(std::forward<U>(value));
     return *static_cast<P*>(this);
   }
 };
diff --git a/tests/parser_test.cpp b/tests/parser_test.cpp
@@ -49,7 +49,13 @@ 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"
+                    "!6f8f\r\n";
 
   ParsedData<
       /* String */ identification,
@@ -104,7 +110,13 @@ 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>
       data;
 
   auto res = P1Parser::parse(data, msg, std::size(msg), true);
@@ -146,6 +158,12 @@ 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);
 }
 
 TEST_CASE("Should report an error if the crc has incorrect format") {

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ struct _ParseResult {`
`68`	`68`
`69`	`69`	`template <class U>`
`70`	`70`	`P& succeed(U&& value) {`
`71`		`- result = std::forward<U>(value);`
	`71`	`+ result = static_cast<T>(std::forward<U>(value));`
`72`	`72`	`return static_cast<P>(this);`
`73`	`73`	`}`
`74`	`74`	`};`