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

Fixed config reload for HA and Domoticz if changed

Browse Source
This commit is contained in:
Gunnar Skjold
2025-01-12 12:01:16 +01:00
parent 1fa62fa97c
commit 4ad2921132
5 changed files with 80 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/AmsToMqttBridge.cpp
View File

@@ -598,14 +598,10 @@ void loop() {
if (mqttEnabled || config.isMqttChanged()) {
if(mqttHandler == NULL || !mqttHandler->connected() || config.isMqttChanged()) {
if(mqttHandler != NULL && config.isMqttChanged()) {
MqttConfig mqttConfig;
if(config.getMqttConfig(mqttConfig)) {
mqttHandler->disconnect();
mqttHandler->setConfig(mqttConfig);
config.ackMqttChange();
}
mqttHandler->disconnect();
}
MQTT_connect();
config.ackMqttChange();
}
} else if(mqttHandler != NULL) {
mqttHandler->disconnect();
@@ -1497,6 +1493,22 @@ void MQTT_connect() {
mqttHandler = NULL;
} else if(config.isMqttChanged()) {
mqttHandler->setConfig(mqttConfig);
switch(mqttConfig.payloadFormat) {
case 3: {
DomoticzConfig domo;
config.getDomoticzConfig(domo);
DomoticzMqttHandler* dmh = (DomoticzMqttHandler*) &mqttHandler;
dmh->setDomoticzConfig(domo);
break;
}
case 4: {
HomeAssistantConfig haconf;
config.getHomeAssistantConfig(haconf);
HomeAssistantMqttHandler* hamh = (HomeAssistantMqttHandler*) &mqttHandler;
hamh->setHomeAssistantConfig(haconf);
break;
}
}
}
}