github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-04-28 21:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed hostname for esp32

Browse Source
This commit is contained in:
Gunnar Skjold
2022-03-11 19:21:27 +01:00
parent 724768afc4
commit 5cfcc015f4
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/AmsToMqttBridge.h
View File

@@ -1,7 +1,7 @@
#ifndef _AMSTOMQTTBRIDGE_H #ifndef _AMSTOMQTTBRIDGE_H
#define _AMSTOMQTTBRIDGE_H #define _AMSTOMQTTBRIDGE_H
#define WIFI_CONNECTION_TIMEOUT 60000; #define WIFI_CONNECTION_TIMEOUT 30000;
#define INVALID_BUTTON_PIN 0xFFFFFFFF #define INVALID_BUTTON_PIN 0xFFFFFFFF

17
src/AmsToMqttBridge.ino
View File

@@ -1031,6 +1031,11 @@ void WiFi_connect() {
wifiReconnectCount++; wifiReconnectCount++;
#if defined(ESP32)
if(strlen(wifi.hostname) > 0) {
WiFi.setHostname(wifi.hostname);
}
#endif
WiFi.mode(WIFI_STA); WiFi.mode(WIFI_STA);
#if defined(ESP32) #if defined(ESP32)
if(wifi.power >= 195) 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 // 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 #endif
} }
if(strlen(wifi.hostname) > 0) { #if defined(ESP8266)
#if defined(ESP8266) if(strlen(wifi.hostname) > 0) {
WiFi.hostname(wifi.hostname); WiFi.hostname(wifi.hostname);
#elif defined(ESP32) }
WiFi.setHostname(wifi.hostname); #endif
#endif
}
WiFi.setAutoReconnect(true); WiFi.setAutoReconnect(true);
WiFi.persistent(true); WiFi.persistent(true);
if(WiFi.begin(wifi.ssid, wifi.psk)) { if(WiFi.begin(wifi.ssid, wifi.psk)) {