From f0648f481f10fcdf3780833aaf40f6f24c401c56 Mon Sep 17 00:00:00 2001 From: 1technophile Date: Thu, 18 Jan 2018 23:14:10 +0100 Subject: [PATCH] correct MQTT connection issue with arduino boards --- OpenMQTTGateway.ino | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/OpenMQTTGateway.ino b/OpenMQTTGateway.ino index fbd9be9..bae648a 100644 --- a/OpenMQTTGateway.ino +++ b/OpenMQTTGateway.ino @@ -194,24 +194,8 @@ void setup() else if (error == OTA_END_ERROR) trc(F("End Failed")); }); ArduinoOTA.begin(); - - #ifdef MDNS_SD - trc(F("Connecting to MQTT by mDNS without mqtt hostname")); - connectMQTTmdns(); - #else - #ifdef mqtt_server_name // if name is defined we define the mqtt server by its name - trc(F("Connecting to MQTT with mqtt hostname")); - IPAddress mqtt_server_ip; - WiFi.hostByName(mqtt_server_name, mqtt_server_ip); - client.setServer(mqtt_server_ip, mqtt_port); - trc(mqtt_server_ip.toString()); - #else // if not by its IP adress - trc(F("Connecting to MQTT by IP adress")); - client.setServer(mqtt_server, mqtt_port); - trc(String(mqtt_server)); - #endif - #endif - #else + + #else // arduino case //Launch serial for debugging purposes Serial.begin(SERIAL_BAUD); //Begining ethernet connection in case of Arduino + W5100 @@ -228,6 +212,23 @@ void setup() digitalWrite(led_send, HIGH); #endif + #ifdef MDNS_SD + trc(F("Connecting to MQTT by mDNS without mqtt hostname")); + connectMQTTmdns(); + #else + #ifdef mqtt_server_name // if name is defined we define the mqtt server by its name + trc(F("Connecting to MQTT with mqtt hostname")); + IPAddress mqtt_server_ip; + WiFi.hostByName(mqtt_server_name, mqtt_server_ip); + client.setServer(mqtt_server_ip, mqtt_port); + trc(mqtt_server_ip.toString()); + #else // if not by its IP adress + trc(F("Connecting to MQTT by IP adress")); + client.setServer(mqtt_server, mqtt_port); + trc(String(mqtt_server)); + #endif + #endif + client.setCallback(callback); delay(1500);