feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'feature/nan_support_c5' into 'master'

Browse Source 
Enable Wi-Fi Aware (NAN) on ESP32C5 and ESP32C61

Closes IDF-10599 and IDF-10628

See merge request espressif/esp-idf!30495
This commit is contained in:
Jiang Jiang Jian
2025-02-13 16:52:00 +08:00
parent c7a0e45489 4b89f9934b
commit 2e5e9fc4aa
7 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/soc/esp32c5/include/soc/Kconfig.soc_caps.in
View File

@@ -1631,6 +1631,10 @@ config SOC_WIFI_MAC_VERSION_NUM
int int
default 3 default 3
config SOC_WIFI_NAN_SUPPORT
bool
default y
config SOC_BLE_SUPPORTED config SOC_BLE_SUPPORTED
bool bool
default y default y

1
components/soc/esp32c5/include/soc/soc_caps.h
View File

@@ -650,6 +650,7 @@
#define SOC_WIFI_HE_SUPPORT (1) /*!< Support Wi-Fi 6 */ #define SOC_WIFI_HE_SUPPORT (1) /*!< Support Wi-Fi 6 */
#define SOC_WIFI_SUPPORT_5G (1) /*!< Support 5G */ #define SOC_WIFI_SUPPORT_5G (1) /*!< Support 5G */
#define SOC_WIFI_MAC_VERSION_NUM (3) /*!< Wi-Fi MAC version num is 3 */ #define SOC_WIFI_MAC_VERSION_NUM (3) /*!< Wi-Fi MAC version num is 3 */
#define SOC_WIFI_NAN_SUPPORT (1) /*!< Support WIFI Aware (NAN) */
/*---------------------------------- Bluetooth CAPS ----------------------------------*/ /*---------------------------------- Bluetooth CAPS ----------------------------------*/
#define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */ #define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */

4
components/soc/esp32c61/include/soc/Kconfig.soc_caps.in
View File

@@ -1239,6 +1239,10 @@ config SOC_WIFI_MAC_VERSION_NUM
int int
default 3 default 3
config SOC_WIFI_NAN_SUPPORT
bool
default y
config SOC_BLE_SUPPORTED config SOC_BLE_SUPPORTED
bool bool
default y default y

1
components/soc/esp32c61/include/soc/soc_caps.h
View File

@@ -504,6 +504,7 @@
#define SOC_WIFI_MESH_SUPPORT (1) /*!< Support WIFI MESH */ #define SOC_WIFI_MESH_SUPPORT (1) /*!< Support WIFI MESH */
#define SOC_WIFI_HE_SUPPORT (1) /*!< Support Wi-Fi 6 */ #define SOC_WIFI_HE_SUPPORT (1) /*!< Support Wi-Fi 6 */
#define SOC_WIFI_MAC_VERSION_NUM (3) /*!< Wi-Fi MAC version num is 3 */ #define SOC_WIFI_MAC_VERSION_NUM (3) /*!< Wi-Fi MAC version num is 3 */
#define SOC_WIFI_NAN_SUPPORT (1) /*!< Support WIFI Aware (NAN) */
/*---------------------------------- Bluetooth CAPS ----------------------------------*/ /*---------------------------------- Bluetooth CAPS ----------------------------------*/
#define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */ #define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */

4
examples/wifi/wifi_aware/nan_console/README.md
View File

@@ -1,5 +1,5 @@
| Supported Targets | ESP32 | ESP32-S2 | | Supported Targets | ESP32 | ESP32-C5 | ESP32-C61 | ESP32-S2 |
| ----------------- | ----- | -------- | | ----------------- | ----- | -------- | --------- | -------- |
# NAN Console Example # NAN Console Example

4
examples/wifi/wifi_aware/nan_publisher/README.md
View File

@@ -1,5 +1,5 @@
| Supported Targets | ESP32 | ESP32-S2 | | Supported Targets | ESP32 | ESP32-C5 | ESP32-C61 | ESP32-S2 |
| ----------------- | ----- | -------- | | ----------------- | ----- | -------- | --------- | -------- |
# NAN Publisher Example # NAN Publisher Example

4
examples/wifi/wifi_aware/nan_subscriber/README.md
View File

@@ -1,5 +1,5 @@
| Supported Targets | ESP32 | ESP32-S2 | | Supported Targets | ESP32 | ESP32-C5 | ESP32-C61 | ESP32-S2 |
| ----------------- | ----- | -------- | | ----------------- | ----- | -------- | --------- | -------- |
# NAN Subscriber Example # NAN Subscriber Example