From 951c15b93a1298fff8fa895469477464732fbda1 Mon Sep 17 00:00:00 2001
From: jptrsn <ptrsnja@gmail.com>
Date: Thu, 18 Jul 2019 19:09:43 -0400
Subject: [PATCH] Fix for reconnect logic to handle OTA

---
 ESP32-mqtt-room.ino | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ESP32-mqtt-room.ino b/ESP32-mqtt-room.ino
index 171825f..b5469c3 100644
--- a/ESP32-mqtt-room.ino
+++ b/ESP32-mqtt-room.ino
@@ -148,6 +148,10 @@ void connectToMqtt() {
 }
 
 bool handleMqttDisconnect() {
+	if (updateInProgress) {
+		Serial.println("Not retrying MQTT connection - OTA update in progress");
+		return true;
+	}
 	if (retryAttempts > 10) {
 		Serial.println("Too many retries. Restarting");
 		ESP.restart();
@@ -169,6 +173,10 @@ bool handleMqttDisconnect() {
 }
 
 bool handleWifiDisconnect() {
+	if (WiFi.isConnected()) {
+		Serial.println("WiFi appears to be connected. Not retrying.");
+		return true;
+	}
 	if (retryAttempts > 10) {
 		Serial.println("Too many retries. Restarting");
 		ESP.restart();
@@ -194,7 +202,7 @@ bool handleWifiDisconnect() {
 }
 
 void WiFiEvent(WiFiEvent_t event) {
-    Serial.printf("[WiFi-event] event: %x", event);
+    Serial.printf("[WiFi-event] event: %x\n\r", event);
 
 		switch(event) {
 	    case SYSTEM_EVENT_STA_GOT_IP: