From c3d4c61650ce893d25a3aa873040d76e49a70de4 Mon Sep 17 00:00:00 2001 From: zhangyanjiao Date: Thu, 30 Apr 2020 16:04:44 +0800 Subject: [PATCH 1/2] esp_wifi:Add softap example channel configuration --- .../wifi/getting_started/softAP/main/Kconfig.projbuild | 7 +++++++ .../wifi/getting_started/softAP/main/softap_example_main.c | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/examples/wifi/getting_started/softAP/main/Kconfig.projbuild b/examples/wifi/getting_started/softAP/main/Kconfig.projbuild index bc4c17f261..ddf166aae8 100644 --- a/examples/wifi/getting_started/softAP/main/Kconfig.projbuild +++ b/examples/wifi/getting_started/softAP/main/Kconfig.projbuild @@ -11,6 +11,13 @@ menu "Example Configuration" default "mypassword" help WiFi password (WPA or WPA2) for the example to use. + config ESP_WIFI_CHANNEL + int "WiFi Channel" + range 1 13 + default 1 + help + WiFi channel (network channel) for the example to use. + config MAX_STA_CONN int "Maximal STA connections" diff --git a/examples/wifi/getting_started/softAP/main/softap_example_main.c b/examples/wifi/getting_started/softAP/main/softap_example_main.c index e648710577..f1388dead5 100644 --- a/examples/wifi/getting_started/softAP/main/softap_example_main.c +++ b/examples/wifi/getting_started/softAP/main/softap_example_main.c @@ -26,6 +26,7 @@ */ #define EXAMPLE_ESP_WIFI_SSID CONFIG_ESP_WIFI_SSID #define EXAMPLE_ESP_WIFI_PASS CONFIG_ESP_WIFI_PASSWORD +#define EXAMPLE_ESP_WIFI_CHANNEL CONFIG_ESP_WIFI_CHANNEL #define EXAMPLE_MAX_STA_CONN CONFIG_MAX_STA_CONN /* FreeRTOS event group to signal when we are connected*/ @@ -65,6 +66,7 @@ void wifi_init_softap() .ap = { .ssid = EXAMPLE_ESP_WIFI_SSID, .ssid_len = strlen(EXAMPLE_ESP_WIFI_SSID), + .channel = EXAMPLE_ESP_WIFI_CHANNEL, .password = EXAMPLE_ESP_WIFI_PASS, .max_connection = EXAMPLE_MAX_STA_CONN, .authmode = WIFI_AUTH_WPA_WPA2_PSK @@ -78,8 +80,9 @@ void wifi_init_softap() ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_AP, &wifi_config)); ESP_ERROR_CHECK(esp_wifi_start()); - ESP_LOGI(TAG, "wifi_init_softap finished.SSID:%s password:%s", - EXAMPLE_ESP_WIFI_SSID, EXAMPLE_ESP_WIFI_PASS); + ESP_LOGI(TAG, "wifi_init_softap finished. SSID:%s password:%s channel:%d", + EXAMPLE_ESP_WIFI_SSID, EXAMPLE_ESP_WIFI_PASS, EXAMPLE_ESP_WIFI_CHANNEL); + } void app_main() From 1a1b3a8538b2882a9da052a61c1191207c54c7ba Mon Sep 17 00:00:00 2001 From: zhangyanjiao Date: Wed, 20 May 2020 17:55:11 +0800 Subject: [PATCH 2/2] wifi changes: 1. fix the bug for softAP update second channel wrong 2. change wifi_scan_time_t from union to struct 3. query country code wrong when policy change from manual to auto 4. fix the crash issue when fetch peer after delete the cur_peer 5. fix the timeout issue of EAPOL four-way handshake --- components/esp32/include/esp_wifi_types.h | 2 +- components/esp32/lib | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/esp32/include/esp_wifi_types.h b/components/esp32/include/esp_wifi_types.h index 2f50da3c51..c838c3eefa 100644 --- a/components/esp32/include/esp_wifi_types.h +++ b/components/esp32/include/esp_wifi_types.h @@ -114,7 +114,7 @@ typedef struct { } wifi_active_scan_time_t; /** @brief Aggregate of active & passive scan time per channel */ -typedef union { +typedef struct { wifi_active_scan_time_t active; /**< active scan time per channel, units: millisecond. */ uint32_t passive; /**< passive scan time per channel, units: millisecond, values above 1500ms may cause station to disconnect from AP and are not recommended. */ diff --git a/components/esp32/lib b/components/esp32/lib index d2427c2885..832e2ccf4b 160000 --- a/components/esp32/lib +++ b/components/esp32/lib @@ -1 +1 @@ -Subproject commit d2427c2885a31adbe5011543d72d7f7d899f8004 +Subproject commit 832e2ccf4b49d8130681fc9cade0329c697cf6c0