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

Adjustments after changing type of phase power

Browse Source
This commit is contained in:
Gunnar Skjold
2024-01-07 11:04:43 +01:00
parent 768dc97c9c
commit 183cb1e2b1
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,14 +3,14 @@
"id" : "%s",
"type" : "%s",
"P" : %d,
"P1" : %.2f,
"P2" : %.2f,
"P3" : %.2f,
"P1" : %d,
"P2" : %d,
"P3" : %d,
"Q" : %d,
"PO" : %d,
"PO1" : %.2f,
"PO2" : %.2f,
"PO3" : %.2f,
"PO1" : %d,
"PO2" : %d,
"PO3" : %d,
"QO" : %d,
"I1" : %.2f,
"I2" : %.2f,

12
lib/JsonMqttHandler/json/json4.json
View File

@@ -11,14 +11,14 @@
"id" : "%s",
"type" : "%s",
"P" : %d,
"P1" : %.2f,
"P2" : %.2f,
"P3" : %.2f,
"P1" : %d,
"P2" : %d,
"P3" : %d,
"Q" : %d,
"PO" : %d,
"PO1" : %.2f,
"PO2" : %.2f,
"PO3" : %.2f,
"PO1" : %d,
"PO2" : %d,
"PO3" : %d,
"QO" : %d,
"I1" : %.2f,
"I2" : %.2f,

12
lib/RawMqttHandler/src/RawMqttHandler.cpp
View File

@@ -95,22 +95,22 @@ bool RawMqttHandler::publishList3(AmsData* data, AmsData* meterState) {
bool RawMqttHandler::publishList4(AmsData* data, AmsData* meterState) {
if(full || meterState->getL1ActiveImportPower() != data->getL1ActiveImportPower()) {
mqtt.publish(topic + "/meter/import/l1", String(data->getL1ActiveImportPower(), 2));
mqtt.publish(topic + "/meter/import/l1", String(data->getL1ActiveImportPower()));
}
if(full || meterState->getL2ActiveImportPower() != data->getL2ActiveImportPower()) {
mqtt.publish(topic + "/meter/import/l2", String(data->getL2ActiveImportPower(), 2));
mqtt.publish(topic + "/meter/import/l2", String(data->getL2ActiveImportPower()));
}
if(full || meterState->getL3ActiveImportPower() != data->getL3ActiveImportPower()) {
mqtt.publish(topic + "/meter/import/l3", String(data->getL3ActiveImportPower(), 2));
mqtt.publish(topic + "/meter/import/l3", String(data->getL3ActiveImportPower()));
}
if(full || meterState->getL1ActiveExportPower() != data->getL1ActiveExportPower()) {
mqtt.publish(topic + "/meter/export/l1", String(data->getL1ActiveExportPower(), 2));
mqtt.publish(topic + "/meter/export/l1", String(data->getL1ActiveExportPower()));
}
if(full || meterState->getL2ActiveExportPower() != data->getL2ActiveExportPower()) {
mqtt.publish(topic + "/meter/export/l2", String(data->getL2ActiveExportPower(), 2));
mqtt.publish(topic + "/meter/export/l2", String(data->getL2ActiveExportPower()));
}
if(full || meterState->getL3ActiveExportPower() != data->getL3ActiveExportPower()) {
mqtt.publish(topic + "/meter/export/l3", String(data->getL3ActiveExportPower(), 2));
mqtt.publish(topic + "/meter/export/l3", String(data->getL3ActiveExportPower()));
}
if(full || meterState->getL1ActiveImportCounter() != data->getL1ActiveImportCounter()) {
mqtt.publish(topic + "/meter/import/l1/accumulated", String(data->getL1ActiveImportCounter(), 2));