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

Added month max to mqtt

Browse Source
This commit is contained in:
Gunnar Skjold
2022-04-01 20:39:22 +02:00
parent e009b4e54e
commit 191d9fa562
6 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mqtt/JsonMqttHandler.cpp
View File

@@ -24,7 +24,8 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccou
data->getActiveImportPower(),
ea->getUseThisHour(),
ea->getUseToday(),
ea->getCurrentThreshold()
ea->getCurrentThreshold(),
ea->getMonthMax()
);
return mqtt->publish(topic, json);
} else if(data->getListType() == 2) {
@@ -51,7 +52,8 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccou
data->getL3Voltage(),
ea->getUseThisHour(),
ea->getUseToday(),
ea->getCurrentThreshold()
ea->getCurrentThreshold(),
ea->getMonthMax()
);
return mqtt->publish(topic, json);
} else if(data->getListType() == 3) {
@@ -83,7 +85,8 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccou
data->getMeterTimestamp(),
ea->getUseThisHour(),
ea->getUseToday(),
ea->getCurrentThreshold()
ea->getCurrentThreshold(),
ea->getMonthMax()
);
return mqtt->publish(topic, json);
} else if(data->getListType() == 4) {
@@ -119,7 +122,8 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccou
data->getMeterTimestamp(),
ea->getUseThisHour(),
ea->getUseToday(),
ea->getCurrentThreshold()
ea->getCurrentThreshold(),
ea->getMonthMax()
);
return mqtt->publish(topic, json);
}

1
src/mqtt/RawMqttHandler.cpp
View File

@@ -75,6 +75,7 @@ bool RawMqttHandler::publish(AmsData* data, AmsData* meterState, EnergyAccountin
mqtt->publish(topic + "/realtime/import/hour", String(ea->getUseThisHour(), 3));
mqtt->publish(topic + "/realtime/import/day", String(ea->getUseToday(), 2));
mqtt->publish(topic + "/realtime/import/threshold", String(ea->getCurrentThreshold(), 10), true, 0);
mqtt->publish(topic + "/realtime/import/monthmax", String(ea->getMonthMax(), 3), true, 0);
return true;
}