espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-09-02 03:11:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/reason_for_ap_stadisconnected_event_v5.1' into 'release/v5.1'

Browse Source 
fix(esp_wifi): Add some bugfixes and cleanup in softAP (Backport v5.1)

See merge request espressif/esp-idf!35576
This commit is contained in:
Jiang Jiang Jian
2024-12-12 10:23:30 +08:00
parent e423469b8a 9584729322
commit bb48bfb0ba
8 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld
View File

@@ -109,7 +109,7 @@ ieee80211_output_do = 0x4000210c;
ieee80211_send_nulldata = 0x40002110; ieee80211_send_nulldata = 0x40002110;
//ieee80211_setup_robust_mgmtframe = 0x40002114; //ieee80211_setup_robust_mgmtframe = 0x40002114;
//ieee80211_mgmt_output = 0x40002118; //ieee80211_mgmt_output = 0x40002118;
ieee80211_send_deauth = 0x40002120; ieee80211_send_deauth_no_bss= 0x40002120;
//ieee80211_tx_mgt_cb = 0x4000212c; //ieee80211_tx_mgt_cb = 0x4000212c;
sta_rx_csa = 0x40002134; sta_rx_csa = 0x40002134;
sta_send_sa_query_req = 0x40002138; sta_send_sa_query_req = 0x40002138;

2
components/esp_rom/esp32c2/ld/esp32c2.rom.ld
View File

@@ -1016,7 +1016,7 @@ ieee80211_alloc_tx_buf = 0x40002108;
/* ieee80211_send_nulldata = 0x40002110; */ /* ieee80211_send_nulldata = 0x40002110; */
/* ieee80211_setup_robust_mgmtframe = 0x40002114; */ /* ieee80211_setup_robust_mgmtframe = 0x40002114; */
ieee80211_encap_null_data = 0x4000211c; ieee80211_encap_null_data = 0x4000211c;
ieee80211_send_deauth = 0x40002120; ieee80211_send_deauth_no_bss = 0x40002120;
ieee80211_alloc_deauth = 0x40002124; ieee80211_alloc_deauth = 0x40002124;
ieee80211_send_proberesp = 0x40002128; ieee80211_send_proberesp = 0x40002128;
ieee80211_getcapinfo = 0x40002130; ieee80211_getcapinfo = 0x40002130;

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: 000bf9389e...cc89db5fdf

2
examples/bluetooth/blufi/main/blufi_example_main.c
View File

@@ -246,7 +246,7 @@ static void wifi_event_handler(void* arg, esp_event_base_t event_base,
} }
case WIFI_EVENT_AP_STADISCONNECTED: { case WIFI_EVENT_AP_STADISCONNECTED: {
wifi_event_ap_stadisconnected_t* event = (wifi_event_ap_stadisconnected_t*) event_data; wifi_event_ap_stadisconnected_t* event = (wifi_event_ap_stadisconnected_t*) event_data;
BLUFI_INFO("station "MACSTR" leave, AID=%d", MAC2STR(event->mac), event->aid); BLUFI_INFO("station "MACSTR" leave, AID=%d, reason=%d", MAC2STR(event->mac), event->aid, event->reason);
break; break;
} }

4
examples/protocols/http_server/captive_portal/main/main.c
View File

@@ -39,8 +39,8 @@ static void wifi_event_handler(void *arg, esp_event_base_t event_base,
MAC2STR(event->mac), event->aid); MAC2STR(event->mac), event->aid);
} else if (event_id == WIFI_EVENT_AP_STADISCONNECTED) { } else if (event_id == WIFI_EVENT_AP_STADISCONNECTED) {
wifi_event_ap_stadisconnected_t *event = (wifi_event_ap_stadisconnected_t *)event_data; wifi_event_ap_stadisconnected_t *event = (wifi_event_ap_stadisconnected_t *)event_data;
ESP_LOGI(TAG, "station " MACSTR " leave, AID=%d", ESP_LOGI(TAG, "station " MACSTR " leave, AID=%d, reason=%d",
MAC2STR(event->mac), event->aid); MAC2STR(event->mac), event->aid, event->reason);
} }
} }

4
examples/wifi/getting_started/softAP/main/softap_example_main.c
View File

@@ -39,8 +39,8 @@ static void wifi_event_handler(void* arg, esp_event_base_t event_base,
MAC2STR(event->mac), event->aid); MAC2STR(event->mac), event->aid);
} else if (event_id == WIFI_EVENT_AP_STADISCONNECTED) { } else if (event_id == WIFI_EVENT_AP_STADISCONNECTED) {
wifi_event_ap_stadisconnected_t* event = (wifi_event_ap_stadisconnected_t*) event_data; wifi_event_ap_stadisconnected_t* event = (wifi_event_ap_stadisconnected_t*) event_data;
ESP_LOGI(TAG, "station "MACSTR" leave, AID=%d", ESP_LOGI(TAG, "station "MACSTR" leave, AID=%d, reason=%d",
MAC2STR(event->mac), event->aid); MAC2STR(event->mac), event->aid, event->reason);
} }
} }

6
examples/wifi/wps_softap_registrar/main/wps.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Unlicense OR CC0-1.0 * SPDX-License-Identifier: Unlicense OR CC0-1.0
*/ */
@@ -62,8 +62,8 @@ static void wifi_event_handler(void* arg, esp_event_base_t event_base,
{ {
ESP_LOGI(TAG, "WIFI_EVENT_AP_STADISCONNECTED"); ESP_LOGI(TAG, "WIFI_EVENT_AP_STADISCONNECTED");
wifi_event_ap_stadisconnected_t* event = (wifi_event_ap_stadisconnected_t*) event_data; wifi_event_ap_stadisconnected_t* event = (wifi_event_ap_stadisconnected_t*) event_data;
ESP_LOGI(TAG, "station "MACSTR" leave, AID=%d", ESP_LOGI(TAG, "station "MACSTR" leave, AID=%d, reason=%d",
MAC2STR(event->mac), event->aid); MAC2STR(event->mac), event->aid, event->reason);
} }
break; break;
case WIFI_EVENT_AP_STACONNECTED: case WIFI_EVENT_AP_STACONNECTED:

2
tools/test_apps/peripherals/i2c_wifi/main/i2c_wifi_main.c
View File

@@ -56,7 +56,7 @@ static void wifi_event_handler(void *arg, esp_event_base_t event_base,
ESP_LOGI(TAG, "station "MACSTR" join, AID=%d", MAC2STR(event->mac), event->aid); ESP_LOGI(TAG, "station "MACSTR" join, AID=%d", MAC2STR(event->mac), event->aid);
} else if (event_id == WIFI_EVENT_AP_STADISCONNECTED) { } else if (event_id == WIFI_EVENT_AP_STADISCONNECTED) {
wifi_event_ap_stadisconnected_t *event = (wifi_event_ap_stadisconnected_t *) event_data; wifi_event_ap_stadisconnected_t *event = (wifi_event_ap_stadisconnected_t *) event_data;
ESP_LOGI(TAG, "station "MACSTR" leave, AID=%d", MAC2STR(event->mac), event->aid); ESP_LOGI(TAG, "station "MACSTR" leave, AID=%d, reason=%d", MAC2STR(event->mac), event->aid, event->reason);
} }
} }