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

esp32: Fix setting WLAN channel in AP mode.

Browse Source 
- Previously the call to esp_wifi_set_channel() would be immediately
  overridden by calling esp_wifi_config(...) with the previous channel set.

- AP interface doesn't seem to need more than esp_wifi_config(...) to work.
  It will automatically configure 40MHz bandwidth and place the secondary
  channel using similar logic to what was being explicitly calculated here.

- However, calling esp_wifi_set_channel() on the STA interface is necessary
  if using this interface with ESP-NOW (without connecting to an AP). So
  the esp_wifi_set_channel() call is kept in for this purpose. Without
  this, tests/multi_espnow/70_channel.py fails.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
This commit is contained in:
Angus Gratton 2024-11-13 10:16:25 +11:00 committed by Damien George
parent 49b83ed44a
commit 03bc561edb
1 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ports/esp32/network_wlan.c
View File

@ -549,21 +549,38 @@ static mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
break; break;
} }
case MP_QSTR_channel: { case MP_QSTR_channel: {
uint8_t primary; uint8_t channel = mp_obj_get_int(kwargs->table[i].value);
wifi_second_chan_t secondary; if (self->if_id == ESP_IF_WIFI_AP) {
// Get the current value of secondary cfg.ap.channel = channel;
esp_exceptions(esp_wifi_get_channel(&primary, &secondary)); } else {
primary = mp_obj_get_int(kwargs->table[i].value); // This setting is only used to determine the
esp_err_t err = esp_wifi_set_channel(primary, secondary); // starting channel for a scan, so it can result in
if (err == ESP_ERR_INVALID_ARG) { // slightly faster connection times.
// May need to swap secondary channel above to below or below to above cfg.sta.channel = channel;
secondary = (
(secondary == WIFI_SECOND_CHAN_ABOVE) // This additional code to directly set the channel
? WIFI_SECOND_CHAN_BELOW // on the STA interface is only relevant for ESP-NOW
: (secondary == WIFI_SECOND_CHAN_BELOW) // (when there is no STA connection attempt.)
uint8_t old_primary;
wifi_second_chan_t secondary;
// Get the current value of secondary
esp_exceptions(esp_wifi_get_channel(&old_primary, &secondary));
esp_err_t err = esp_wifi_set_channel(channel, secondary);
if (err == ESP_ERR_INVALID_ARG) {
// May need to swap secondary channel above to below or below to above
secondary = (
(secondary == WIFI_SECOND_CHAN_ABOVE)
? WIFI_SECOND_CHAN_BELOW
: (secondary == WIFI_SECOND_CHAN_BELOW)
? WIFI_SECOND_CHAN_ABOVE ? WIFI_SECOND_CHAN_ABOVE
: WIFI_SECOND_CHAN_NONE); : WIFI_SECOND_CHAN_NONE);
esp_exceptions(esp_wifi_set_channel(primary, secondary)); err = esp_wifi_set_channel(channel, secondary);
}
esp_exceptions(err);
if (channel != old_primary) {
// Workaround the ESP-IDF Wi-Fi stack sometimes taking a moment to change channels
mp_hal_delay_ms(1);
}
} }
break; break;
} }