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

Merge branch 'bugfix/connect_before_connected_v5.4' into 'release/v5.4'

Browse Source 
fix(conn): wifi connect before connected status (v5.4)

See merge request espressif/esp-idf!40103
This commit is contained in:
Jiang Jiang Jian
2025-07-10 21:12:47 +08:00
parent 05cf51dc74 89f5e5d149
commit ef59c0c296
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/esp_wifi/test_apps/wifi_connect/main/app_main.c
View File

@@ -37,6 +37,7 @@ void setUp(void)
void tearDown(void) void tearDown(void)
{ {
ESP_ERROR_CHECK(esp_wifi_deinit()); ESP_ERROR_CHECK(esp_wifi_deinit());
vTaskDelay(500 / portTICK_PERIOD_MS);
size_t after_free_8bit = heap_caps_get_free_size(MALLOC_CAP_8BIT); size_t after_free_8bit = heap_caps_get_free_size(MALLOC_CAP_8BIT);
size_t after_free_32bit = heap_caps_get_free_size(MALLOC_CAP_32BIT); size_t after_free_32bit = heap_caps_get_free_size(MALLOC_CAP_32BIT);
check_leak(before_free_8bit, after_free_8bit, "8BIT"); check_leak(before_free_8bit, after_free_8bit, "8BIT");

17
components/esp_wifi/test_apps/wifi_connect/main/test_wifi_conn.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Unlicense OR CC0-1.0 * SPDX-License-Identifier: Unlicense OR CC0-1.0
* *
@@ -272,11 +272,11 @@ static void esp_wifi_connect_first_time(void)
// make sure softap has started // make sure softap has started
vTaskDelay(1000 / portTICK_PERIOD_MS); vTaskDelay(1000 / portTICK_PERIOD_MS);
wifi_config_t w_config; wifi_config_t w_config = {
memset(&w_config, 0, sizeof(w_config)); .sta.ssid = TEST_DEFAULT_SSID,
memcpy(w_config.sta.ssid, TEST_DEFAULT_SSID, strlen(TEST_DEFAULT_SSID)); .sta.password = "invalid_password",
memcpy(w_config.sta.password, TEST_DEFAULT_PWD, strlen(TEST_DEFAULT_PWD)); .sta.channel = 1,
w_config.sta.channel = 1; };
wifi_event_handler_flag |= EVENT_HANDLER_FLAG_DO_NOT_AUTO_RECONNECT; wifi_event_handler_flag |= EVENT_HANDLER_FLAG_DO_NOT_AUTO_RECONNECT;
@@ -284,7 +284,6 @@ static void esp_wifi_connect_first_time(void)
ESP_LOGI(TAG, "start esp_wifi_connect first time: %s", TEST_DEFAULT_SSID); ESP_LOGI(TAG, "start esp_wifi_connect first time: %s", TEST_DEFAULT_SSID);
TEST_ESP_OK(esp_wifi_connect()); TEST_ESP_OK(esp_wifi_connect());
} }
static void test_wifi_connect_at_scan_phase(void) static void test_wifi_connect_at_scan_phase(void)
{ {
@@ -304,8 +303,8 @@ static void test_wifi_connect_before_connected_phase(void)
esp_wifi_connect_first_time(); esp_wifi_connect_first_time();
// connect before connected // connect before connected from channel 1 to 6 need 720ms
vTaskDelay(730 / portTICK_PERIOD_MS); vTaskDelay(725 / portTICK_PERIOD_MS);
ESP_LOGI(TAG, "connect when first connect after scan before connected"); ESP_LOGI(TAG, "connect when first connect after scan before connected");
TEST_ESP_ERR(ESP_ERR_WIFI_CONN, esp_wifi_connect()); TEST_ESP_ERR(ESP_ERR_WIFI_CONN, esp_wifi_connect());
wifi_event_handler_flag |= EVENT_HANDLER_FLAG_DO_NOT_AUTO_RECONNECT; wifi_event_handler_flag |= EVENT_HANDLER_FLAG_DO_NOT_AUTO_RECONNECT;

3
components/esp_wifi/test_apps/wifi_connect/sdkconfig.defaults
View File

@@ -1,3 +1,4 @@
# ignore task watchdog triggered by unity_run_menu # ignore task watchdog triggered by unity_run_menu
CONFIG_ESP_TASK_WDT=n CONFIG_ESP_TASK_WDT_EN=n
CONFIG_FREERTOS_HZ=1000