Merge branch 'master' into tft-gui-work

This commit is contained in:
Manuel 2024-05-16 01:55:53 +02:00 committed by GitHub
commit 3e0a7f43e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -225,10 +225,16 @@ bool initWifi()
WiFi.mode(WIFI_STA);
WiFi.setHostname(ourHost);
if (config.network.address_mode == meshtastic_Config_NetworkConfig_AddressMode_STATIC &&
config.network.ipv4_config.ip != 0) {
#ifndef ARCH_RP2040
WiFi.config(config.network.ipv4_config.ip, config.network.ipv4_config.gateway, config.network.ipv4_config.subnet,
config.network.ipv4_config.dns);
#else
WiFi.config(config.network.ipv4_config.ip, config.network.ipv4_config.dns, config.network.ipv4_config.gateway,
config.network.ipv4_config.subnet);
#endif
}
#ifndef ARCH_RP2040
WiFi.onEvent(WiFiEvent);