github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-02-07 00:48:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed buffer issues and ESP8266 HA reboot issue"

Browse Source
This commit is contained in:
Gunnar Skjold
2023-12-23 18:32:27 +01:00
parent 557ba659d5
commit 6e3a6f71e2
5 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,24 +23,24 @@ bool HomeAssistantMqttHandler::publish(AmsData* data, AmsData* previousState, En
if(time(nullptr) < FirmwareVersion::BuildEpoch)
return false;
if(data->getListType() >= 3) { // publish energy counts
publishList3(data, ea);
loop();
}
// if(data->getListType() >= 3) { // publish energy counts
// publishList3(data, ea);
// loop();
// }
if(data->getListType() == 1) { // publish power counts
publishList1(data, ea);
} else if(data->getListType() <= 3) { // publish power counts and volts/amps
publishList2(data, ea);
} else if(data->getListType() == 4) { // publish power counts and volts/amps/phase power and PF
publishList4(data, ea);
}
// if(data->getListType() == 1) { // publish power counts
// publishList1(data, ea);
// } else if(data->getListType() <= 3) { // publish power counts and volts/amps
// publishList2(data, ea);
// } else if(data->getListType() == 4) { // publish power counts and volts/amps/phase power and PF
// publishList4(data, ea);
// }
loop();
if(ea->isInitialized()) {
publishRealtime(data, ea, eapi);
loop();
}
// if(ea->isInitialized()) {
// publishRealtime(data, ea, eapi);
// loop();
// }
return true;
}
@@ -319,7 +319,7 @@ bool HomeAssistantMqttHandler::publishPrices(EntsoeApi* eapi) {
bool HomeAssistantMqttHandler::publishSystem(HwTools* hw, EntsoeApi* eapi, EnergyAccounting* ea) {
if(topic.isEmpty() || !mqtt.connected())
return false;
publishSystemSensors();
if(hw->getTemperature() > -50) publishTemperatureSensor(0, "");
@@ -337,7 +337,7 @@ bool HomeAssistantMqttHandler::publishSystem(HwTools* hw, EntsoeApi* eapi, Energ
return ret;
}
void HomeAssistantMqttHandler::publishSensor(const HomeAssistantSensor& sensor) {
void HomeAssistantMqttHandler::publishSensor(const HomeAssistantSensor sensor) {
String uid = String(sensor.path);
uid.replace(".", "");
uid.replace("[", "");