From ee1969831597201f32e2133e8ef4bab21dd4bdc6 Mon Sep 17 00:00:00 2001
From: Daniel Gangl <31815106+killer0071234@users.noreply.github.com>
Date: Sun, 23 Apr 2023 20:59:45 +0200
Subject: [PATCH 1/2] Update fields.h

---
 src/dsmr/fields.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/dsmr/fields.h b/src/dsmr/fields.h
index 9dde26c..3e0d724 100644
--- a/src/dsmr/fields.h
+++ b/src/dsmr/fields.h
@@ -210,7 +210,9 @@ namespace dsmr
       static constexpr char dm3[] = "dm3";
       static constexpr char GJ[] = "GJ";
       static constexpr char MJ[] = "MJ";
+      static constexpr char var[] = "var";
       static constexpr char kvar[] = "kvar";
+      static constexpr char varh[] = "varh";
       static constexpr char kvarh[] = "kvarh";
     };
 

From ee25375493a8b17dde5d8c722e546a5eb32bc429 Mon Sep 17 00:00:00 2001
From: Daniel Gangl <31815106+killer0071234@users.noreply.github.com>
Date: Sun, 23 Apr 2023 21:24:46 +0200
Subject: [PATCH 2/2] Update fields.h

---
 src/dsmr/fields.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/dsmr/fields.h b/src/dsmr/fields.h
index 3e0d724..d334b8b 100644
--- a/src/dsmr/fields.h
+++ b/src/dsmr/fields.h
@@ -262,8 +262,8 @@ namespace dsmr
     /*
  * Extra fields used for Luxembourg
  */
-    DEFINE_FIELD(total_imported_energy, FixedValue, ObisId(1, 0, 3, 8, 0), FixedField, units::kvarh, units::kvarh);
-    DEFINE_FIELD(total_exported_energy, FixedValue, ObisId(1, 0, 4, 8, 0), FixedField, units::kvarh, units::kvarh);
+    DEFINE_FIELD(total_imported_energy, FixedValue, ObisId(1, 0, 3, 8, 0), FixedField, units::kvarh, units::varh);
+    DEFINE_FIELD(total_exported_energy, FixedValue, ObisId(1, 0, 4, 8, 0), FixedField, units::kvarh, units::varh);
 
     /* Tariff indicator electricity. The tariff indicator can also be used
  * to switch tariff dependent loads e.g boilers. This is the
@@ -278,8 +278,8 @@ namespace dsmr
     /*
  * Extra fields used for Luxembourg
  */
-    DEFINE_FIELD(reactive_power_delivered, FixedValue, ObisId(1, 0, 3, 7, 0), FixedField, units::kvar, units::kvar);
-    DEFINE_FIELD(reactive_power_returned, FixedValue, ObisId(1, 0, 4, 7, 0), FixedField, units::kvar, units::kvar);
+    DEFINE_FIELD(reactive_power_delivered, FixedValue, ObisId(1, 0, 3, 7, 0), FixedField, units::kvar, units::var);
+    DEFINE_FIELD(reactive_power_returned, FixedValue, ObisId(1, 0, 4, 7, 0), FixedField, units::kvar, units::var);
 
     /* The actual threshold Electricity in kW. Removed in 4.0.7 / 4.2.2 / 5.0 */
     DEFINE_FIELD(electricity_threshold, FixedValue, ObisId(0, 0, 17, 0, 0), FixedField, units::kW, units::W);