From 2c95f036ba8b0aeb8ebc4fa7d796001f00851916 Mon Sep 17 00:00:00 2001 From: Gunnar Skjold Date: Thu, 15 Aug 2024 19:44:24 +0200 Subject: [PATCH] Fixed power factor sensors in HA --- lib/HomeAssistantMqttHandler/json/ha4.json | 8 ++++---- .../src/HomeAssistantMqttHandler.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/HomeAssistantMqttHandler/json/ha4.json b/lib/HomeAssistantMqttHandler/json/ha4.json index 4504f945..111e3a89 100644 --- a/lib/HomeAssistantMqttHandler/json/ha4.json +++ b/lib/HomeAssistantMqttHandler/json/ha4.json @@ -18,10 +18,10 @@ "U1" : %.2f, "U2" : %.2f, "U3" : %.2f, - "PF" : %.2f, - "PF1" : %.2f, - "PF2" : %.2f, - "PF3" : %.2f, + "PF" : %d, + "PF1" : %d, + "PF2" : %d, + "PF3" : %d, "tPI1" : %.3f, "tPI2" : %.3f, "tPI3" : %.3f, diff --git a/lib/HomeAssistantMqttHandler/src/HomeAssistantMqttHandler.cpp b/lib/HomeAssistantMqttHandler/src/HomeAssistantMqttHandler.cpp index 225efeca..d18d34f6 100644 --- a/lib/HomeAssistantMqttHandler/src/HomeAssistantMqttHandler.cpp +++ b/lib/HomeAssistantMqttHandler/src/HomeAssistantMqttHandler.cpp @@ -124,10 +124,10 @@ bool HomeAssistantMqttHandler::publishList4(AmsData* data, EnergyAccounting* ea) data->getL1Voltage(), data->getL2Voltage(), data->getL3Voltage(), - data->getPowerFactor() == 0 ? 1 : data->getPowerFactor(), - data->getPowerFactor() == 0 ? 1 : data->getL1PowerFactor(), - data->getPowerFactor() == 0 ? 1 : data->getL2PowerFactor(), - data->getPowerFactor() == 0 ? 1 : data->getL3PowerFactor(), + data->getPowerFactor() == 0 ? 100 : (int) (data->getPowerFactor() * 100), + data->getPowerFactor() == 0 ? 100 : (int) (data->getL1PowerFactor() * 100), + data->getPowerFactor() == 0 ? 100 : (int) (data->getL2PowerFactor() * 100), + data->getPowerFactor() == 0 ? 100 : (int) (data->getL3PowerFactor() * 100), data->getL1ActiveImportCounter(), data->getL2ActiveImportCounter(), data->getL3ActiveImportCounter(),