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

Merge branch 'backport/backport_some_changes_to_v5.3_20250106' into 'release/v5.3'

Browse Source 
Backport/backport some changes to v5.3 20250106

See merge request espressif/esp-idf!36234
This commit is contained in:
Jiang Jiang Jian
2025-01-09 19:54:38 +08:00
parent 3b9242212c 93582b8221
commit 77eaf678f6
15 changed files with 75 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
components/esp_wifi/CMakeLists.txt
View File

@ -4,6 +4,22 @@ if(${idf_target} STREQUAL "linux")
return() # This component is not supported by the POSIX/Linux simulator
endif()
if( NOT CONFIG_ESP_WIFI_ENABLED
AND NOT CONFIG_ESP_HOST_WIFI_ENABLED
AND NOT CMAKE_BUILD_EARLY_EXPANSION )
# No local wifi: provide only netif bindings
set(srcs
"src/wifi_default.c"
"src/wifi_netif.c"
"src/wifi_default_ap.c")
# This component provides "esp_wifi" "wifi_apps/nan_app" headers if WiFi not enabled
# (implementation supported optionally in a managed component esp_wifi_remote)
idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS "include" "wifi_apps/nan_app/include")
return()
endif()
if(CONFIG_ESP_WIFI_ENABLED OR CONFIG_ESP_HOST_WIFI_ENABLED)
if(CONFIG_APP_NO_BLOBS)
@ -42,19 +58,10 @@ if(CONFIG_ESP_WIFI_ENABLED OR CONFIG_ESP_HOST_WIFI_ENABLED)
if(CONFIG_ESP_WIFI_ENABLE_ROAMING_APP)
list(APPEND srcs "wifi_apps/roaming_app/src/roaming_app.c")
endif()
set(local_include_dirs include/local)
else()
# No local wifi: provide only netif bindings
set(srcs
"src/wifi_default.c"
"src/wifi_netif.c"
"src/wifi_default_ap.c")
set(local_include_dirs)
endif()
idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS "include" "wifi_apps/include" "wifi_apps/nan_app/include" ${local_include_dirs}
INCLUDE_DIRS "include" "include/local" "wifi_apps/include" "wifi_apps/nan_app/include"
REQUIRES esp_event esp_phy esp_netif
PRIV_REQUIRES driver esptool_py esp_pm esp_timer nvs_flash

3
components/esp_wifi/Kconfig
View File

@ -1,7 +1,6 @@
menu "Wi-Fi"
# TODO: Disable WIFI support on ESP32-H2 (WIFI-5796)
# visible if SOC_WIFI_SUPPORTED
visible if (SOC_WIFI_SUPPORTED || SOC_WIRELESS_HOST_SUPPORTED)
config ESP_WIFI_ENABLED
bool

11
components/esp_wifi/include/esp_now.h
View File

@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2019-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2019-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -93,15 +93,8 @@ typedef struct esp_now_recv_info {
/**
* @brief ESPNOW rate config
*
*/
typedef struct esp_now_rate_config {
wifi_phy_mode_t phymode; /**< ESPNOW phymode of specified interface */
wifi_phy_rate_t rate; /**< ESPNOW rate of specified interface */
bool ersu; /**< ESPNOW using ERSU to send frame, ERSU is a transmission mode related to 802.11 ax.
ERSU is always used in long distance transmission, and its frame has lower rate compared with SU mode */
bool dcm; /**< ESPNOW using dcm rate to send frame */
} esp_now_rate_config_t;
typedef wifi_tx_rate_config_t esp_now_rate_config_t;
/**
* @brief Callback function of receiving ESPNOW data

18
components/esp_wifi/include/esp_wifi.h
View File

@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -1529,6 +1529,7 @@ esp_err_t esp_wifi_get_country_code(char *country);
* @brief Config 80211 tx rate of specified interface
*
* @attention 1. This API should be called after esp_wifi_init() and before esp_wifi_start().
* @attention 2. Can not set 80211 tx rate under 11A/11AC/11AX protocol, you can use esp_wifi_config_80211_tx instead.
*
* @param ifx Interface to be configured.
* @param rate Phy rate to be configured.
@ -1539,6 +1540,21 @@ esp_err_t esp_wifi_get_country_code(char *country);
*/
esp_err_t esp_wifi_config_80211_tx_rate(wifi_interface_t ifx, wifi_phy_rate_t rate);
/**
* @brief Config 80211 tx rate and phymode of specified interface
*
* @attention 1. This API should be called after esp_wifi_init() and before esp_wifi_start().
*
* @param ifx Interface to be configured.
* @param config rate_config to be configured.
*
* @return
* - ESP_OK: succeed
* - others: failed
*/
esp_err_t esp_wifi_config_80211_tx(wifi_interface_t ifx, wifi_tx_rate_config_t *config);
/**
* @brief Disable PMF configuration for specified interface
*

2
components/esp_wifi/include/esp_wifi_ap_get_sta_list.h
View File

@ -17,7 +17,7 @@ extern "C" {
// Number of maximum wifi connection may be undefined if we have no native wifi support on this target
// and at the same time there's no native interface injected by the wifi_remote component.
// In this case, we just let the header compilable, since no wifi API could be used (let's make a sanity check)
#if !CONFIG_SOC_WIFI_SUPPORTED && !CONFIG_ESP_WIFI_REMOTE_ENABLED
#if !CONFIG_SOC_WIFI_SUPPORTED && !CONFIG_ESP_WIFI_REMOTE_ENABLED && !CONFIG_ESP_HOST_WIFI_ENABLED
#define ESP_WIFI_MAX_CONN_NUM (15)
typedef struct wifi_sta_list_t wifi_sta_list_t;
#else

13
components/esp_wifi/include/esp_wifi_types_generic.h
View File

@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -1213,6 +1213,17 @@ typedef enum {
WIFI_BAND_2G_5G = 3, /* Band is 2,4G + 5G */
} wifi_band_t;
/**
* @brief Argument structure for wifi_tx_rate_config
*/
typedef struct {
wifi_phy_mode_t phymode; /**< Phymode of specified interface */
wifi_phy_rate_t rate; /**< Rate of specified interface */
bool ersu; /**< Using ERSU to send frame, ERSU is a transmission mode related to 802.11 ax.
ERSU is always used in long distance transmission, and its frame has lower rate compared with SU mode */
bool dcm; /**< Using dcm rate to send frame */
} wifi_tx_rate_config_t;
#ifdef __cplusplus
}
#endif

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: 19143aa249...4ecb60fcbb

9
components/wifi_provisioning/CMakeLists.txt
View File

@ -4,6 +4,15 @@ if(${target} STREQUAL "linux")
return() # This component is not supported by the POSIX/Linux simulator
endif()
if( NOT CONFIG_ESP_WIFI_ENABLED
AND NOT CONFIG_ESP_HOST_WIFI_ENABLED
AND NOT CMAKE_BUILD_EARLY_EXPANSION )
# This component provides only "esp_provisioning" headers if WiFi not enabled
# (implementation supported optionally in a managed component esp_wifi_remote)
idf_component_register(INCLUDE_DIRS include)
return()
endif()
set(srcs "src/wifi_config.c"
"src/wifi_scan.c"
"src/wifi_ctrl.c"

2
components/wifi_provisioning/Kconfig
View File

@ -1,5 +1,5 @@
menu "Wi-Fi Provisioning Manager"
visible if (SOC_WIFI_SUPPORTED || SOC_WIRELESS_HOST_SUPPORTED)
config WIFI_PROV_SCAN_MAX_ENTRIES
int "Max Wi-Fi Scan Result Entries"
default 16

4
components/wpa_supplicant/CMakeLists.txt
View File

@ -6,7 +6,9 @@ else()
set(linker_fragments linker.lf)
endif()
if(NOT CONFIG_ESP_WIFI_ENABLED AND NOT CONFIG_ESP_HOST_WIFI_ENABLED AND NOT CMAKE_BUILD_EARLY_EXPANSION)
if( NOT CONFIG_ESP_WIFI_ENABLED
AND NOT CONFIG_ESP_HOST_WIFI_ENABLED
AND NOT CMAKE_BUILD_EARLY_EXPANSION )
# This component provides only "esp_supplicant" headers if WiFi not enabled
# (implementation supported optionally in a managed component esp_wifi_remote)
idf_component_register(INCLUDE_DIRS esp_supplicant/include)

2
examples/common_components/protocol_examples_common/Kconfig.projbuild
View File

@ -4,7 +4,7 @@ menu "Example Connection Configuration"
config EXAMPLE_CONNECT_WIFI
bool "connect using WiFi interface"
depends on !IDF_TARGET_LINUX && (SOC_WIFI_SUPPORTED || ESP_WIFI_REMOTE_ENABLED)
depends on !IDF_TARGET_LINUX && (SOC_WIFI_SUPPORTED || ESP_WIFI_REMOTE_ENABLED || ESP_HOST_WIFI_ENABLED)
default y if SOC_WIFI_SUPPORTED
help
Protocol examples can use Wi-Fi, Ethernet and/or Thread to connect to the network.

8
examples/system/console/advanced/components/cmd_wifi/CMakeLists.txt
View File

@ -1,3 +1,9 @@
idf_component_register(SRCS "cmd_wifi.c"
if(CONFIG_ESP_WIFI_ENABLED OR CONFIG_ESP_HOST_WIFI_ENABLED)
set(srcs "cmd_wifi.c")
else()
set(srcs)
endif()
idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS .
REQUIRES console esp_wifi)

9
examples/system/console/advanced/components/cmd_wifi/cmd_wifi.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
*/
@ -24,11 +24,6 @@
#include "esp_event.h"
#include "cmd_wifi.h"
/**
* This component will be supported using esp_wifi_remote
*/
#if CONFIG_SOC_WIFI_SUPPORTED
#define JOIN_TIMEOUT_MS (10000)
static EventGroupHandle_t wifi_event_group;
@ -139,5 +134,3 @@ void register_wifi(void)
ESP_ERROR_CHECK( esp_console_cmd_register(&join_cmd) );
}
#endif // CONFIG_SOC_WIFI_SUPPORTED

2
examples/system/console/advanced/main/console_example_main.c
View File

@ -174,7 +174,7 @@ void app_main(void)
#if SOC_DEEP_SLEEP_SUPPORTED
register_system_deep_sleep();
#endif
#if SOC_WIFI_SUPPORTED
#if (CONFIG_ESP_WIFI_ENABLED || CONFIG_ESP_HOST_WIFI_ENABLED)
register_wifi();
#endif
register_nvs();

2
examples/system/console/basic/main/console_example_main.c
View File

@ -97,7 +97,7 @@ void app_main(void)
#if SOC_DEEP_SLEEP_SUPPORTED
register_system_deep_sleep();
#endif
#if SOC_WIFI_SUPPORTED
#if (CONFIG_ESP_WIFI_ENABLED || CONFIG_ESP_HOST_WIFI_ENABLED)
register_wifi();
#endif
register_nvs();