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

Minor changes after testing MQTT reconnect

Browse Source
This commit is contained in:
Gunnar Skjold 2020-02-11 17:25:52 +01:00
parent ad820fff01
commit 5f14517258
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/AmsToMqttBridge.ino
View File

@ -72,12 +72,6 @@ void setup() {
{
setupWiFi();
if(config.mqttHost) {
mqtt.begin(config.mqttHost, config.mqttPort, *client);
// Notify everyone we're here!
sendMqttData("Connected!");
}
// Configure uart for AMS data
#if defined SOFTWARE_SERIAL
if(config.meterType == 3) {
@ -118,15 +112,16 @@ void loop()
// Reconnect to WiFi and MQTT as needed
if (WiFi.status() != WL_CONNECTED) {
WiFi_connect();
}
if (config.mqttHost) {
mqtt.loop();
delay(10); // <- fixes some issues with WiFi stability
if(!mqtt.connected()) {
MQTT_connect();
} else {
if (config.mqttHost) {
mqtt.loop();
yield();
if(!mqtt.connected()) {
MQTT_connect();
}
}
}
readHanPort();
}
else
@ -305,6 +300,7 @@ void MQTT_connect() {
return;
}
if(millis() - lastMqttRetry < 5000) {
yield();
return;
}
lastMqttRetry = millis();
@ -315,6 +311,11 @@ void MQTT_connect() {
debugger->print(config.mqttPort);
debugger->println();
}
mqtt.disconnect();
mqtt.begin(config.mqttHost, config.mqttPort, *client);
// Connect to a unsecure or secure MQTT server
if ((config.mqttUser == 0 && mqtt.connect(config.mqttClientID)) ||
(config.mqttUser != 0 && mqtt.connect(config.mqttClientID, config.mqttUser, config.mqttPass))) {
@ -325,6 +326,8 @@ void MQTT_connect() {
mqtt.subscribe(config.mqttSubscribeTopic);
if (debugger) debugger->printf(" Subscribing to [%s]\r\n", config.mqttSubscribeTopic);
}
sendMqttData("Connected!");
} else {
if (debugger) {
debugger->print(" failed, ");
@ -341,11 +344,6 @@ void sendMqttData(String data)
if (config.mqttPublishTopic == 0 || strlen(config.mqttPublishTopic) == 0)
return;
// Make sure we're connected
if (!client->connected() || !mqtt.connected()) {
MQTT_connect();
}
// Build a json with the message in a "data" attribute
StaticJsonDocument<500> json;
json["id"] = WiFi.macAddress();