Added support for power factor

src/AmsData.cpp

@@ -28,6 +28,10 @@ void AmsData::apply(AmsData& other) {
         this->listType = other.getListType();
     switch(other.getListType()) {
         case 3:
+            this->powerFactor = other.getPowerFactor();
+            this->l1PowerFactor = other.getL1PowerFactor();
+            this->l2PowerFactor = other.getL2PowerFactor();
+            this->l3PowerFactor = other.getL3PowerFactor();
             this->meterTimestamp = other.getMeterTimestamp();
             this->activeImportCounter = other.getActiveImportCounter();
             this->activeExportCounter = other.getActiveExportCounter();
@@ -127,6 +131,22 @@ float AmsData::getL3Current() {
     return this->l3current;
 }
 
+float AmsData::getPowerFactor() {
+    return this->powerFactor;
+}
+
+float AmsData::getL1PowerFactor() {
+    return this->l1PowerFactor;
+}
+
+float AmsData::getL2PowerFactor() {
+    return this->l2PowerFactor;
+}
+
+float AmsData::getL3PowerFactor() {
+    return this->l3PowerFactor;
+}
+
 float AmsData::getActiveImportCounter() {
     return this->activeImportCounter;
 }

src/AmsData.h

@@ -46,6 +46,11 @@ public:
     float getL2Current();
     float getL3Current();
 
+    float getPowerFactor();
+    float getL1PowerFactor();
+    float getL2PowerFactor();
+    float getL3PowerFactor();
+
     float getActiveImportCounter();
     float getReactiveImportCounter();
     float getActiveExportCounter();
@@ -62,6 +67,7 @@ protected:
     time_t meterTimestamp = 0;
     uint16_t activeImportPower = 0, reactiveImportPower = 0, activeExportPower = 0, reactiveExportPower = 0;
     float l1voltage = 0, l2voltage = 0, l3voltage = 0, l1current = 0, l2current = 0, l3current = 0;
+    float powerFactor = 0, l1PowerFactor = 0, l2PowerFactor = 0, l3PowerFactor = 0;
     float activeImportCounter = 0, reactiveImportCounter = 0, activeExportCounter = 0, reactiveExportCounter = 0;
     bool threePhase = false, twoPhase = false, counterEstimated = false;
 };

src/IEC6205675.cpp

@@ -266,6 +266,23 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, CosemDateTime packag
             meterTimestamp = ts;
         }
 
+        u32 = getUnsignedNumber(AMS_OBIS_POWER_FACTOR, sizeof(AMS_OBIS_POWER_FACTOR), ((char *) (d)));
+        if(u32 != 0xFFFFFFFF) {
+            powerFactor = u32 / 100.0;
+        }
+        u32 = getUnsignedNumber(AMS_OBIS_POWER_FACTOR_L1, sizeof(AMS_OBIS_POWER_FACTOR_L1), ((char *) (d)));
+        if(u32 != 0xFFFFFFFF) {
+            l1PowerFactor = u32 / 100.0;
+        }
+        u32 = getUnsignedNumber(AMS_OBIS_POWER_FACTOR_L2, sizeof(AMS_OBIS_POWER_FACTOR_L2), ((char *) (d)));
+        if(u32 != 0xFFFFFFFF) {
+            l2PowerFactor = u32 / 100.0;
+        }
+        u32 = getUnsignedNumber(AMS_OBIS_POWER_FACTOR_L3, sizeof(AMS_OBIS_POWER_FACTOR_L3), ((char *) (d)));
+        if(u32 != 0xFFFFFFFF) {
+            l3PowerFactor = u32 / 100.0;
+        }
+
         lastUpdateMillis = millis();
     }
 

src/IEC6205675.h

@@ -56,6 +56,10 @@ private:
     uint8_t AMS_OBIS_ACTIVE_EXPORT_COUNT[4]     = {  2, 8, 0, 255 };
     uint8_t AMS_OBIS_REACTIVE_IMPORT_COUNT[4]   = {  3, 8, 0, 255 };
     uint8_t AMS_OBIS_REACTIVE_EXPORT_COUNT[4]   = {  4, 8, 0, 255 };
+    uint8_t AMS_OBIS_POWER_FACTOR[4]            = { 13, 7, 0, 255 };
+    uint8_t AMS_OBIS_POWER_FACTOR_L1[4]         = { 33, 7, 0, 255 };
+    uint8_t AMS_OBIS_POWER_FACTOR_L2[4]         = { 53, 7, 0, 255 };
+    uint8_t AMS_OBIS_POWER_FACTOR_L3[4]         = { 73, 7, 0, 255 };
 
 };
 #endif

src/mqtt/RawMqttHandler.cpp

@@ -19,6 +19,18 @@ bool RawMqttHandler::publish(AmsData* data, AmsData* meterState) {
             mqtt->publish(topic + "/meter/import/active/accumulated", String(data->getActiveImportCounter(), 2), true, 0);
             mqtt->publish(topic + "/meter/export/reactive/accumulated", String(data->getReactiveExportCounter(), 2), true, 0);
             mqtt->publish(topic + "/meter/export/active/accumulated", String(data->getActiveExportCounter(), 2), true, 0);
+            if(full || meterState->getPowerFactor() != data->getPowerFactor()) {
+                mqtt->publish(topic + "/meter/powerfactor", String(data->getPowerFactor(), 2));
+            }
+            if(full || meterState->getL1PowerFactor() != data->getL1PowerFactor()) {
+                mqtt->publish(topic + "/meter/l1/powerfactor", String(data->getL1PowerFactor(), 2));
+            }
+            if(full || meterState->getL2PowerFactor() != data->getL2PowerFactor()) {
+                mqtt->publish(topic + "/meter/l1/powerfactor", String(data->getL1PowerFactor(), 2));
+            }
+            if(full || meterState->getL3PowerFactor() != data->getL3PowerFactor()) {
+                mqtt->publish(topic + "/meter/l1/powerfactor", String(data->getL1PowerFactor(), 2));
+            }
         case 2:
             // Only send data if changed. ID and Type is sent on the 10s interval only if changed
             if(full || meterState->getMeterId() != data->getMeterId()) {

src/web/AmsWebServer.cpp

@@ -730,7 +730,7 @@ void AmsWebServer::dataJson() {
 		mqttStatus = 3;
 	}
 
-	char json[300];
+	char json[340];
 	snprintf_P(json, sizeof(json), DATA_JSON,
 		maxPwr == 0 ? meterState->isThreePhase() ? 20000 : 10000 : maxPwr,
 		meterConfig->productionCapacity,
@@ -749,6 +749,10 @@ void AmsWebServer::dataJson() {
 		meterState->getL1Current(),
 		meterState->getL2Current(),
 		meterState->getL3Current(),
+		meterState->getPowerFactor(),
+		meterState->getL1PowerFactor(),
+		meterState->getL2PowerFactor(),
+		meterState->getL3PowerFactor(),
 		vcc,
 		rssi,
 		hw->getTemperature(),