Fix scoping issue when setting the IP address #100

This commit is contained in:
Robert Strouse 2023-07-16 12:07:55 -07:00
parent 9fdf5896d1
commit f62dcef161
5 changed files with 22 additions and 4 deletions

View file

@ -216,9 +216,10 @@ bool Network::connectWired() {
if(!this->ethStarted) {
this->ethStarted = true;
WiFi.mode(WIFI_OFF);
if(!settings.IP.dhcp)
if(!settings.IP.dhcp) {
if(!ETH.config(settings.IP.ip, settings.IP.gateway, settings.IP.subnet, settings.IP.dns1, settings.IP.dns2))
ETH.config(INADDR_NONE, INADDR_NONE, INADDR_NONE, INADDR_NONE);
}
else
ETH.config(INADDR_NONE, INADDR_NONE, INADDR_NONE, INADDR_NONE);
WiFi.onEvent(this->networkEvent);
@ -271,9 +272,10 @@ bool Network::connectWiFi() {
this->connectStart = millis();
Serial.print("Set hostname to:");
Serial.println(WiFi.getHostname());
if(!settings.IP.dhcp)
if(!settings.IP.dhcp) {
if(!WiFi.config(settings.IP.ip, settings.IP.gateway, settings.IP.subnet, settings.IP.dns1, settings.IP.dns2))
WiFi.config(INADDR_NONE, INADDR_NONE, INADDR_NONE, INADDR_NONE);
}
else
WiFi.config(INADDR_NONE, INADDR_NONE, INADDR_NONE, INADDR_NONE);
WiFi.setSleep(false);