github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-25 11:56:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed power factor sensors in HA

Browse Source
This commit is contained in:
Gunnar Skjold
2024-08-15 19:44:24 +02:00
parent c5c0b52eb7
commit 2c95f036ba
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/HomeAssistantMqttHandler/json/ha4.json
View File

@@ -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,

8
lib/HomeAssistantMqttHandler/src/HomeAssistantMqttHandler.cpp
View File

@@ -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(),