Skip to content

eliminates error messages when using Ethernet Static IP #5836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Nov 9, 2021
Merged

eliminates error messages when using Ethernet Static IP #5836

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ec86d4e
eliminates error messages when using Ethernet Static IP
SuGlider Nov 3, 2021
1d2f95c
Revert "eliminates error messages when using Ethernet Static IP"
SuGlider Nov 4, 2021
f52c108
Merge branch 'espressif:master' into issue_5733_static_ip_eth
SuGlider Nov 4, 2021
4b1a6fb
eliminates error messages when using Ethernet Static IP
SuGlider Nov 4, 2021
f5dab40
eliminates error messages when using Ethernet Static IP
SuGlider Nov 5, 2021
86b776e
Eliminates error messages with Ethernet Static IP
SuGlider Nov 5, 2021
9747792
Eliminates error messages with Ethernet Static IP
SuGlider Nov 8, 2021
4851939
Merge branch 'espressif:master' into issue_5733_static_ip_eth
SuGlider Nov 8, 2021
73c3b02
Eliminates error messages with Ethernet Static IP
SuGlider Nov 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions libraries/WiFi/src/ETH.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,16 @@ bool ETHClass::config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, I
info.gw.addr = 0;
info.netmask.addr = 0;
}

// avoid error messages or failure while DHCP still did not get stopped
uint8_t tries = 5;
do {
const TickType_t xDelay = 50 / portTICK_PERIOD_MS;
vTaskDelay( xDelay );
err = tcpip_adapter_dhcpc_stop(TCPIP_ADAPTER_IF_ETH);
tries--;
} while (tries && err != ESP_ERR_TCPIP_ADAPTER_DHCP_ALREADY_STOPPED);

err = tcpip_adapter_dhcpc_stop(TCPIP_ADAPTER_IF_ETH);
if(err != ESP_OK && err != ESP_ERR_TCPIP_ADAPTER_DHCP_ALREADY_STOPPED){
log_e("DHCP could not be stopped! Error: %d", err);
return false;
Expand All @@ -396,7 +404,8 @@ bool ETHClass::config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, I
if(err != ERR_OK){
log_e("STA IP could not be configured! Error: %d", err);
return false;
}
}

if(info.ip.addr){
staticIP = true;
} else {
Expand Down