Merge branch 'main' into dev-v2.3

lib/AmsData/include/AmsData.h

@@ -69,6 +69,14 @@ public:
     float getL2ActiveExportPower();
     float getL3ActiveExportPower();
 
+    double getL1ActiveImportCounter();
+    double getL2ActiveImportCounter();
+    double getL3ActiveImportCounter();
+
+    double getL1ActiveExportCounter();
+    double getL2ActiveExportCounter();
+    double getL3ActiveExportCounter();
+
     double getActiveImportCounter();
     double getReactiveImportCounter();
     double getActiveExportCounter();
@@ -93,6 +101,8 @@ protected:
     float l1voltage = 0, l2voltage = 0, l3voltage = 0, l1current = 0, l2current = 0, l3current = 0;
     float l1activeImportPower = 0, l2activeImportPower = 0, l3activeImportPower = 0;
     float l1activeExportPower = 0, l2activeExportPower = 0, l3activeExportPower = 0;
+    double l1activeImportCounter = 0, l2activeImportCounter = 0, l3activeImportCounter = 0;
+    double l1activeExportCounter = 0, l2activeExportCounter = 0, l3activeExportCounter = 0;
     float powerFactor = 0, l1PowerFactor = 0, l2PowerFactor = 0, l3PowerFactor = 0;
     double activeImportCounter = 0, reactiveImportCounter = 0, activeExportCounter = 0, reactiveExportCounter = 0;
     bool threePhase = false, twoPhase = false, counterEstimated = false, l2currentMissing = false;;

lib/AmsData/src/AmsData.cpp

@@ -57,6 +57,12 @@ void AmsData::apply(AmsData& other) {
             this->l1activeExportPower = other.getL1ActiveExportPower();
             this->l2activeExportPower = other.getL2ActiveExportPower();
             this->l3activeExportPower = other.getL3ActiveExportPower();
+            this->l1activeImportCounter = other.getL1ActiveImportCounter();
+            this->l2activeImportCounter = other.getL2ActiveImportCounter();
+            this->l3activeImportCounter = other.getL3ActiveImportCounter();
+            this->l1activeExportCounter = other.getL1ActiveExportCounter();
+            this->l2activeExportCounter = other.getL2ActiveExportCounter();
+            this->l3activeExportCounter = other.getL3ActiveExportCounter();
         case 3:
             this->meterTimestamp = other.getMeterTimestamp();
             this->activeImportCounter = other.getActiveImportCounter();
@@ -286,6 +292,30 @@ float AmsData::getL3ActiveExportPower() {
     return this->l3activeExportPower;
 }
 
+double AmsData::getL1ActiveImportCounter() {
+    return this->l1activeImportCounter;
+}
+
+double AmsData::getL2ActiveImportCounter() {
+    return this->l2activeImportCounter;
+}
+
+double AmsData::getL3ActiveImportCounter() {
+    return this->l3activeImportCounter;
+}
+
+double AmsData::getL1ActiveExportCounter() {
+    return this->l1activeExportCounter;
+}
+
+double AmsData::getL2ActiveExportCounter() {
+    return this->l2activeExportCounter;
+}
+
+double AmsData::getL3ActiveExportCounter() {
+    return this->l3activeExportCounter;
+}
+
 double AmsData::getActiveImportCounter() {
     return this->activeImportCounter;
 }