From 39db5eb3e800092bb07125d77d371e2233eb86ec Mon Sep 17 00:00:00 2001 From: Matthias Hoelling Date: Sat, 7 Nov 2020 23:10:45 +0100 Subject: [PATCH 1/2] avoid duplicate Wifi.begin() by relying on WiFi.setAutoConnect(), only try MQTT connect if WiFi is connected for ESP8266 --- src/Homie/Boot/BootNormal.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Homie/Boot/BootNormal.cpp b/src/Homie/Boot/BootNormal.cpp index c8b6db47..dbf5e7d3 100644 --- a/src/Homie/Boot/BootNormal.cpp +++ b/src/Homie/Boot/BootNormal.cpp @@ -387,12 +387,16 @@ void BootNormal::_onWifiDisconnected(const WiFiEventStationModeDisconnected& eve Interface::get().event.wifiReason = event.reason; Interface::get().eventHandler(Interface::get().event); - _wifiConnect(); + //_wifiConnect(); } #endif // ESP32 void BootNormal::_mqttConnect() { - if (!Interface::get().disable) { + bool fence=!Interface::get().disable;; + #if defined(ESP8266) + fence &= WiFi.isConnected(); + #endif // ESP32 + if (fence) { if (Interface::get().led.enabled) Interface::get().getBlinker().start(LED_MQTT_DELAY); _mqttConnectNotified = false; Interface::get().getLogger() << F("↕ Attempting to connect to MQTT...") << endl; From 970f8937506f63e40997ff0d825cd5f59dd40eae Mon Sep 17 00:00:00 2001 From: Matthias Hoelling Date: Sat, 7 Nov 2020 23:31:44 +0100 Subject: [PATCH 2/2] avoid duplicate Wifi.begin() by relying on WiFi.setAutoConnect(), only try MQTT connect if WiFi is connected for ESP8266 --- src/Homie/Boot/BootNormal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Homie/Boot/BootNormal.cpp b/src/Homie/Boot/BootNormal.cpp index dbf5e7d3..ed64ab31 100644 --- a/src/Homie/Boot/BootNormal.cpp +++ b/src/Homie/Boot/BootNormal.cpp @@ -392,7 +392,7 @@ void BootNormal::_onWifiDisconnected(const WiFiEventStationModeDisconnected& eve #endif // ESP32 void BootNormal::_mqttConnect() { - bool fence=!Interface::get().disable;; + bool fence = !Interface::get().disable;; #if defined(ESP8266) fence &= WiFi.isConnected(); #endif // ESP32