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

MQTT on interval

Browse Source
This commit is contained in:
Gunnar Skjold
2024-04-21 10:21:39 +02:00
parent efacbd4b31
commit 3f1861deda
11 changed files with 125 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,25 +8,36 @@
#include "hexutils.h"
#include "Uptime.h"
bool RawMqttHandler::publish(AmsData* data, AmsData* meterState, EnergyAccounting* ea, PriceService* ps) {
bool RawMqttHandler::publish(AmsData* update, AmsData* previousState, EnergyAccounting* ea, PriceService* ps) {
if(topic.isEmpty() || !mqtt.connected())
return false;
if(data->getPackageTimestamp() > 0) {
mqtt.publish(topic + "/meter/dlms/timestamp", String(data->getPackageTimestamp()));
AmsData data;
if(mqttConfig.stateUpdate) {
uint64_t now = millis64();
if(now-lastStateUpdate < mqttConfig.stateUpdateInterval * 1000) return false;
data.apply(*previousState);
data.apply(*update);
lastStateUpdate = now;
} else {
data = *update;
}
switch(data->getListType()) {
if(data.getPackageTimestamp() > 0) {
mqtt.publish(topic + "/meter/dlms/timestamp", String(data.getPackageTimestamp()));
}
switch(data.getListType()) {
case 4:
publishList4(data, meterState);
publishList4(&data, previousState);
loop();
case 3:
publishList3(data, meterState);
publishList3(&data, previousState);
loop();
case 2:
publishList2(data, meterState);
publishList2(&data, previousState);
loop();
case 1:
publishList1(data, meterState);
publishList1(&data, previousState);
loop();
}
if(ea->isInitialized()) {