github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-04-06 14:21:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Energy accounting

Browse Source
This commit is contained in:
Gunnar Skjold
2022-01-29 19:27:48 +01:00
parent 8c69f9a738
commit 77ce5d8e90
25 changed files with 483 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mqtt/JsonMqttHandler.cpp
View File

@@ -8,7 +8,7 @@
#include "web/root/jsonsys_json.h"
#include "web/root/jsonprices_json.h"
bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState) {
bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea) {
if(topic.isEmpty() || !mqtt->connected())
return false;
@@ -22,7 +22,9 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState) {
hw->getVcc(),
hw->getWifiRssi(),
hw->getTemperature(),
data->getActiveImportPower()
data->getActiveImportPower(),
ea->getUseThisHour(),
ea->getCurrentThreshold()
);
return mqtt->publish(topic, json);
} else if(data->getListType() == 2) {
@@ -47,7 +49,9 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState) {
data->getL3Current(),
data->getL1Voltage(),
data->getL2Voltage(),
data->getL3Voltage()
data->getL3Voltage(),
ea->getUseThisHour(),
ea->getCurrentThreshold()
);
return mqtt->publish(topic, json);
} else if(data->getListType() == 3) {
@@ -78,7 +82,9 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState) {
data->getActiveExportCounter(),
data->getReactiveImportCounter(),
data->getReactiveExportCounter(),
data->getMeterTimestamp()
data->getMeterTimestamp(),
ea->getUseThisHour(),
ea->getCurrentThreshold()
);
return mqtt->publish(topic, json);
} else {
@@ -112,7 +118,9 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState) {
data->getActiveExportCounter(),
data->getReactiveImportCounter(),
data->getReactiveExportCounter(),
data->getMeterTimestamp()
data->getMeterTimestamp(),
ea->getUseThisHour(),
ea->getCurrentThreshold()
);
return mqtt->publish(topic, json);
}