From 89f5e5d14964c7d06efcae361c943db013876b67 Mon Sep 17 00:00:00 2001 From: ding huan Date: Fri, 13 Jun 2025 19:08:40 +0800 Subject: [PATCH] fix(conn): wifi connect before connected status --- .../test_apps/wifi_connect/main/app_main.c | 1 + .../wifi_connect/main/test_wifi_conn.c | 17 ++++++++--------- .../test_apps/wifi_connect/sdkconfig.defaults | 3 ++- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/components/esp_wifi/test_apps/wifi_connect/main/app_main.c b/components/esp_wifi/test_apps/wifi_connect/main/app_main.c index 5816593f4a..3d14ad85dc 100644 --- a/components/esp_wifi/test_apps/wifi_connect/main/app_main.c +++ b/components/esp_wifi/test_apps/wifi_connect/main/app_main.c @@ -37,6 +37,7 @@ void setUp(void) void tearDown(void) { 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_32bit = heap_caps_get_free_size(MALLOC_CAP_32BIT); check_leak(before_free_8bit, after_free_8bit, "8BIT"); diff --git a/components/esp_wifi/test_apps/wifi_connect/main/test_wifi_conn.c b/components/esp_wifi/test_apps/wifi_connect/main/test_wifi_conn.c index 2088774a55..8602330315 100644 --- a/components/esp_wifi/test_apps/wifi_connect/main/test_wifi_conn.c +++ b/components/esp_wifi/test_apps/wifi_connect/main/test_wifi_conn.c @@ -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 * @@ -272,11 +272,11 @@ static void esp_wifi_connect_first_time(void) // make sure softap has started vTaskDelay(1000 / portTICK_PERIOD_MS); - wifi_config_t w_config; - memset(&w_config, 0, sizeof(w_config)); - memcpy(w_config.sta.ssid, TEST_DEFAULT_SSID, strlen(TEST_DEFAULT_SSID)); - memcpy(w_config.sta.password, TEST_DEFAULT_PWD, strlen(TEST_DEFAULT_PWD)); - w_config.sta.channel = 1; + wifi_config_t w_config = { + .sta.ssid = TEST_DEFAULT_SSID, + .sta.password = "invalid_password", + .sta.channel = 1, + }; 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); TEST_ESP_OK(esp_wifi_connect()); } - 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(); - // connect before connected - vTaskDelay(730 / portTICK_PERIOD_MS); + // connect before connected from channel 1 to 6 need 720ms + vTaskDelay(725 / portTICK_PERIOD_MS); ESP_LOGI(TAG, "connect when first connect after scan before connected"); TEST_ESP_ERR(ESP_ERR_WIFI_CONN, esp_wifi_connect()); wifi_event_handler_flag |= EVENT_HANDLER_FLAG_DO_NOT_AUTO_RECONNECT; diff --git a/components/esp_wifi/test_apps/wifi_connect/sdkconfig.defaults b/components/esp_wifi/test_apps/wifi_connect/sdkconfig.defaults index 7a161c4bbd..4f3584cd25 100644 --- a/components/esp_wifi/test_apps/wifi_connect/sdkconfig.defaults +++ b/components/esp_wifi/test_apps/wifi_connect/sdkconfig.defaults @@ -1,3 +1,4 @@ # ignore task watchdog triggered by unity_run_menu -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n +CONFIG_FREERTOS_HZ=1000