fengqi/lv_micropython
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

esp32/network_lan: Make LAN.active(state) succeed if already in state.

Browse Source 
This PR ensures that `network.LAN.active(True/False)` will succeed if the
LAN is already in the desired state.

Currently, `lan.active(True)` will raise an `OSError` exception if the LAN
is already in the desired state.  This is inconsistent with
`network.WLAN.active(True/False)` and causes `lan.active(True)` to raise an
exception after a soft reset (causing common network startup scripts to
fail for LAN interfaces).

Signed-off-by: Glenn Moloney <glenn.moloney@gmail.com>
This commit is contained in:
Glenn Moloney 2024-06-30 22:01:32 +10:00 committed by Damien George
parent 91f4a6b9e9
commit 868d311a23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ports/esp32/network_lan.c
View File

@ -312,13 +312,14 @@ static mp_obj_t lan_active(size_t n_args, const mp_obj_t *args) {
lan_if_obj_t *self = MP_OBJ_TO_PTR(args[0]); lan_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
if (n_args > 1) { if (n_args > 1) {
if (mp_obj_is_true(args[1])) { bool make_active = mp_obj_is_true(args[1]);
if (make_active && !self->base.active) {
esp_netif_set_hostname(self->base.netif, mod_network_hostname_data); esp_netif_set_hostname(self->base.netif, mod_network_hostname_data);
self->base.active = (esp_eth_start(self->eth_handle) == ESP_OK); self->base.active = (esp_eth_start(self->eth_handle) == ESP_OK);
if (!self->base.active) { if (!self->base.active) {
mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("ethernet enable failed")); mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("ethernet enable failed"));
} }
} else { } else if (!make_active && self->base.active) {
self->base.active = !(esp_eth_stop(self->eth_handle) == ESP_OK); self->base.active = !(esp_eth_stop(self->eth_handle) == ESP_OK);
if (self->base.active) { if (self->base.active) {
mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("ethernet disable failed")); mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("ethernet disable failed"));