From 5cfcc015f472b049b295f50b7470128ed08240b2 Mon Sep 17 00:00:00 2001
From: Gunnar Skjold <gunnar@origin.no>
Date: Fri, 11 Mar 2022 19:21:27 +0100
Subject: [PATCH] Fixed hostname for esp32

---
 src/AmsToMqttBridge.h   |  2 +-
 src/AmsToMqttBridge.ino | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/AmsToMqttBridge.h b/src/AmsToMqttBridge.h
index fa05c3d8..b359cab7 100644
--- a/src/AmsToMqttBridge.h
+++ b/src/AmsToMqttBridge.h
@@ -1,7 +1,7 @@
 #ifndef _AMSTOMQTTBRIDGE_H
 #define _AMSTOMQTTBRIDGE_H
 
-#define WIFI_CONNECTION_TIMEOUT 60000;
+#define WIFI_CONNECTION_TIMEOUT 30000;
 
 #define INVALID_BUTTON_PIN  0xFFFFFFFF
 
diff --git a/src/AmsToMqttBridge.ino b/src/AmsToMqttBridge.ino
index 115dcb05..a16e4924 100644
--- a/src/AmsToMqttBridge.ino
+++ b/src/AmsToMqttBridge.ino
@@ -1031,6 +1031,11 @@ void WiFi_connect() {
 
 		wifiReconnectCount++;
 
+		#if defined(ESP32)
+			if(strlen(wifi.hostname) > 0) {
+				WiFi.setHostname(wifi.hostname);
+			}	
+		#endif
 		WiFi.mode(WIFI_STA);
 		#if defined(ESP32)
 			if(wifi.power >= 195)
@@ -1082,13 +1087,11 @@ void WiFi_connect() {
 			// WiFi.config(INADDR_NONE, INADDR_NONE, INADDR_NONE); // Workaround to make DHCP hostname work for ESP32. See: https://github.com/espressif/arduino-esp32/issues/2537
 			#endif
 		}
-		if(strlen(wifi.hostname) > 0) {
-			#if defined(ESP8266)
-			WiFi.hostname(wifi.hostname);
-			#elif defined(ESP32)
-			WiFi.setHostname(wifi.hostname);
-			#endif
-		}	
+		#if defined(ESP8266)
+			if(strlen(wifi.hostname) > 0) {
+				WiFi.hostname(wifi.hostname);
+			}	
+		#endif
 		WiFi.setAutoReconnect(true);
 		WiFi.persistent(true);
 		if(WiFi.begin(wifi.ssid, wifi.psk)) {