Skip to content

Commit 49fdd4a

Browse files
david-cermakdavid-cermak
committed
fix(wifi_remote): Update per v5.5 espressif/esp-idf@dd9f8bfcbcc1 
1 parent f14a9e3 commit 49fdd4a

File tree

6 files changed

+96
-10
lines changed

6 files changed

+96
-10
lines changed

‎components/esp_wifi_remote/idf_v5.5/Kconfig.slave_select.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
bool "esp32c2"
1515
config SLAVE_IDF_TARGET_ESP32C6
1616
bool "esp32c6"
17+
config SLAVE_IDF_TARGET_ESP32C5
18+
bool "esp32c5"
1719
config SLAVE_IDF_TARGET_ESP32C61
1820
bool "esp32c61"
1921
endchoice

‎components/esp_wifi_remote/idf_v5.5/Kconfig.soc_wifi_caps.in‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,70 @@ if SLAVE_IDF_TARGET_ESP32C6
268268

269269
endif # ESP32C6
270270

271+
if SLAVE_IDF_TARGET_ESP32C5
272+
273+
config SLAVE_SOC_WIFI_SUPPORTED # ignore: multiple-definition
274+
bool
275+
default y
276+
277+
config SLAVE_SOC_WIFI_LIGHT_SLEEP_CLK_WIDTH # ignore: multiple-definition
278+
int
279+
default 12
280+
281+
config SLAVE_SOC_WIFI_HW_TSF # ignore: multiple-definition
282+
bool
283+
default y
284+
285+
config SLAVE_SOC_WIFI_FTM_SUPPORT # ignore: multiple-definition
286+
bool
287+
default n
288+
289+
config SLAVE_SOC_WIFI_GCMP_SUPPORT # ignore: multiple-definition
290+
bool
291+
default y
292+
293+
config SLAVE_SOC_WIFI_WAPI_SUPPORT # ignore: multiple-definition
294+
bool
295+
default y
296+
297+
config SLAVE_SOC_WIFI_CSI_SUPPORT # ignore: multiple-definition
298+
bool
299+
default y
300+
301+
config SLAVE_SOC_WIFI_MESH_SUPPORT # ignore: multiple-definition
302+
bool
303+
default y
304+
305+
config SLAVE_SOC_WIFI_HE_SUPPORT # ignore: multiple-definition
306+
bool
307+
default y
308+
309+
config SLAVE_SOC_WIFI_SUPPORT_5G # ignore: multiple-definition
310+
bool
311+
default y
312+
313+
config SLAVE_SOC_WIFI_MAC_VERSION_NUM # ignore: multiple-definition
314+
int
315+
default 3
316+
317+
config SLAVE_SOC_WIFI_NAN_SUPPORT # ignore: multiple-definition
318+
bool
319+
default y
320+
321+
config SLAVE_FREERTOS_UNICORE # ignore: multiple-definition
322+
bool
323+
default y
324+
325+
config SLAVE_IDF_TARGET_ARCH_RISCV # ignore: multiple-definition
326+
bool
327+
default y
328+
329+
config SLAVE_IDF_ENV_BRINGUP # ignore: multiple-definition
330+
bool
331+
default y
332+
333+
endif # ESP32C5
334+
271335
if SLAVE_IDF_TARGET_ESP32C61
272336

273337
config SLAVE_SOC_WIFI_SUPPORTED # ignore: multiple-definition

‎components/esp_wifi_remote/idf_v5.5/include/esp_wifi_default_config.h‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -641,14 +641,21 @@
641641

642642
#if CONFIG_SLAVE_IDF_TARGET_ESP32C5
643643
#define CONFIG_ESP_WIFI_REMOTE_ENABLED 1
644-
#define CONFIG_SLAVE_IDF_TARGET_ESP32 1
644+
#define CONFIG_SLAVE_IDF_TARGET_ESP32C5 1
645645
#define CONFIG_SLAVE_SOC_WIFI_SUPPORTED 1
646646
#define CONFIG_SLAVE_SOC_WIFI_WAPI_SUPPORT 1
647647
#define CONFIG_SLAVE_SOC_WIFI_CSI_SUPPORT 1
648648
#define CONFIG_SLAVE_SOC_WIFI_MESH_SUPPORT 1
649-
#define CONFIG_SLAVE_SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW 1
650649
#define CONFIG_SLAVE_SOC_WIFI_NAN_SUPPORT 1
651-
#define CONFIG_SLAVE_IDF_TARGET_ARCH_XTENSA 1
650+
#define CONFIG_SLAVE_SOC_WIFI_LIGHT_SLEEP_CLK_WIDTH 12
651+
#define CONFIG_SLAVE_SOC_WIFI_HW_TSF 1
652+
#define CONFIG_SLAVE_FREERTOS_UNICORE 1
653+
#define CONFIG_SLAVE_SOC_WIFI_GCMP_SUPPORT 1
654+
#define CONFIG_SLAVE_IDF_TARGET_ARCH_RISCV 1
655+
#define CONFIG_SLAVE_SOC_WIFI_HE_SUPPORT 1
656+
#define CONFIG_SLAVE_SOC_WIFI_MAC_VERSION_NUM 3
657+
#define CONFIG_SLAVE_SOC_WIFI_SUPPORT_5G 1
658+
#define CONFIG_SLAVE_IDF_ENV_BRINGUP 1
652659
#define CONFIG_ESP_WIFI_REMOTE_LIBRARY_HOSTED 1
653660
#define CONFIG_WIFI_RMT_STATIC_RX_BUFFER_NUM 10
654661
#define CONFIG_WIFI_RMT_DYNAMIC_RX_BUFFER_NUM 32
@@ -663,17 +670,19 @@
663670
#define CONFIG_WIFI_RMT_AMPDU_RX_ENABLED 1
664671
#define CONFIG_WIFI_RMT_RX_BA_WIN 6
665672
#define CONFIG_WIFI_RMT_NVS_ENABLED 1
666-
#define CONFIG_WIFI_RMT_TASK_PINNED_TO_CORE_0 1
667673
#define CONFIG_WIFI_RMT_SOFTAP_BEACON_MAX_LEN 752
668674
#define CONFIG_WIFI_RMT_MGMT_SBUF_NUM 32
669675
#define CONFIG_WIFI_RMT_IRAM_OPT 1
676+
#define CONFIG_WIFI_RMT_EXTRA_IRAM_OPT 1
670677
#define CONFIG_WIFI_RMT_RX_IRAM_OPT 1
671678
#define CONFIG_WIFI_RMT_ENABLE_WPA3_SAE 1
672679
#define CONFIG_WIFI_RMT_ENABLE_SAE_PK 1
673680
#define CONFIG_WIFI_RMT_ENABLE_SAE_H2E 1
674681
#define CONFIG_WIFI_RMT_SOFTAP_SAE_SUPPORT 1
675682
#define CONFIG_WIFI_RMT_ENABLE_WPA3_OWE_STA 1
683+
#define CONFIG_WIFI_RMT_SLP_IRAM_OPT 1
676684
#define CONFIG_WIFI_RMT_SLP_DEFAULT_MIN_ACTIVE_TIME 50
685+
#define CONFIG_WIFI_RMT_BSS_MAX_IDLE_SUPPORT 1
677686
#define CONFIG_WIFI_RMT_SLP_DEFAULT_MAX_ACTIVE_TIME 10
678687
#define CONFIG_WIFI_RMT_SLP_DEFAULT_WAIT_BROADCAST_DATA_TIME 15
679688
#define CONFIG_WIFI_RMT_STA_DISCONNECTED_PM_ENABLE 1
@@ -682,6 +691,7 @@
682691
#define CONFIG_WIFI_RMT_ESPNOW_MAX_ENCRYPT_NUM 7
683692
#define CONFIG_WIFI_RMT_MBEDTLS_CRYPTO 1
684693
#define CONFIG_WIFI_RMT_MBEDTLS_TLS_CLIENT 1
694+
#define CONFIG_WIFI_RMT_TX_HETB_QUEUE_NUM 3
685695
#define CONFIG_WIFI_RMT_ENTERPRISE_SUPPORT 1
686696
#define CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM 10
687697
#define CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM 32
@@ -697,13 +707,16 @@
697707
#define CONFIG_ESP_WIFI_SOFTAP_BEACON_MAX_LEN 752
698708
#define CONFIG_ESP_WIFI_MGMT_SBUF_NUM 32
699709
#define CONFIG_ESP_WIFI_IRAM_OPT 1
710+
#define CONFIG_ESP_WIFI_EXTRA_IRAM_OPT 1
700711
#define CONFIG_ESP_WIFI_RX_IRAM_OPT 1
701712
#define CONFIG_ESP_WIFI_ENABLE_WPA3_SAE 1
702713
#define CONFIG_ESP_WIFI_ENABLE_SAE_PK 1
703714
#define CONFIG_ESP_WIFI_ENABLE_SAE_H2E 1
704715
#define CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT 1
705716
#define CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA 1
717+
#define CONFIG_ESP_WIFI_SLP_IRAM_OPT 1
706718
#define CONFIG_ESP_WIFI_SLP_DEFAULT_MIN_ACTIVE_TIME 50
719+
#define CONFIG_ESP_WIFI_BSS_MAX_IDLE_SUPPORT 1
707720
#define CONFIG_ESP_WIFI_SLP_DEFAULT_MAX_ACTIVE_TIME 10
708721
#define CONFIG_ESP_WIFI_SLP_DEFAULT_WAIT_BROADCAST_DATA_TIME 15
709722
#define CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE 1
@@ -712,6 +725,7 @@
712725
#define CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM 7
713726
#define CONFIG_ESP_WIFI_MBEDTLS_CRYPTO 1
714727
#define CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT 1
728+
#define CONFIG_ESP_WIFI_TX_HETB_QUEUE_NUM 3
715729
#define CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT 1
716730
#endif // CONFIG_SLAVE_IDF_TARGET_ESP32C5
717731

‎components/esp_wifi_remote/idf_v5.5/include/injected/esp_wifi.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ esp_err_t esp_wifi_scan_get_ap_records(uint16_t *number, wifi_ap_record_t *ap_re
613613
*
614614
* @attention Different from esp_wifi_scan_get_ap_records(), this API only gets one AP record
615615
* from the scanned AP list each time. This API will free the memory of one AP record,
616-
* if the user doesn't get all records in the scannned AP list, then needs to call esp_wifi_clear_ap_list()
616+
* if the user doesn't get all records in the scanned AP list, then needs to call esp_wifi_clear_ap_list()
617617
* to free the remaining memory.
618618
*
619619
* @param[out] ap_record pointer to one AP record
@@ -774,6 +774,8 @@ esp_err_t esp_wifi_get_bandwidth(wifi_interface_t ifx, wifi_bandwidth_t *bw);
774774
* @attention 4. When device is in STA+softAP mode, this API should not be called when in the scenarios described above
775775
* @attention 5. The channel info set by this API will not be stored in NVS. So If you want to remember the channel used before WiFi stop,
776776
* you need to call this API again after WiFi start, or you can call `esp_wifi_set_config()` to store the channel info in NVS.
777+
* @attention 6. When operating in 5 GHz band, the second channel is automatically determined by the primary channel according to the 802.11 standard.
778+
* Any manually configured second channel will be ignored.
777779
*
778780
* @param primary for HT20, primary is the channel number, for HT40, primary is the primary channel
779781
* @param second for HT20, second is ignored, for HT40, second is the second channel

‎components/esp_wifi_remote/idf_v5.5/include/injected/esp_wifi_he_types.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -167,6 +167,7 @@ typedef enum {
167167
RX_BB_FORMAT_HE_MU = 5, /**< the reception frame is a HE MU MPDU */
168168
RX_BB_FORMAT_HE_ERSU = 6, /**< the reception frame is a HE ER SU MPDU */
169169
RX_BB_FORMAT_HE_TB = 7, /**< the reception frame is a HE TB MPDU */
170+
RX_BB_FORMAT_VHT_MU = 11, /**< the reception frame is a VHT MU MPDU */
170171
} wifi_rx_bb_format_t;
171172

172173
/**

‎components/esp_wifi_remote/idf_v5.5/include/injected/esp_wifi_types_generic.h‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -562,21 +562,24 @@ typedef struct {
562562
uint32_t ft_enabled: 1; /**< Whether FT is enabled for the connection */
563563
uint32_t owe_enabled: 1; /**< Whether OWE is enabled for the connection */
564564
uint32_t transition_disable: 1; /**< Whether to enable transition disable feature */
565-
uint32_t reserved: 26; /**< Reserved for future feature set */
565+
uint32_t reserved1: 26; /**< Reserved for future feature set */
566566
wifi_sae_pwe_method_t sae_pwe_h2e; /**< Configuration for SAE PWE derivation method */
567567
wifi_sae_pk_mode_t sae_pk_mode; /**< Configuration for SAE-PK (Public Key) Authentication method */
568568
uint8_t failure_retry_cnt; /**< Number of connection retries station will do before moving to next AP. scan_method should be set as WIFI_ALL_CHANNEL_SCAN to use this config.
569569
Note: Enabling this may cause connection time to increase in case best AP doesn't behave properly. */
570570
uint32_t he_dcm_set: 1; /**< Whether DCM max.constellation for transmission and reception is set. */
571571
uint32_t he_dcm_max_constellation_tx: 2; /**< Indicate the max.constellation for DCM in TB PPDU the STA supported. 0: not supported. 1: BPSK, 2: QPSK, 3: 16-QAM. The default value is 3. */
572572
uint32_t he_dcm_max_constellation_rx: 2; /**< Indicate the max.constellation for DCM in both Data field and HE-SIG-B field the STA supported. 0: not supported. 1: BPSK, 2: QPSK, 3: 16-QAM. The default value is 3. */
573-
uint32_t he_mcs9_enabled: 1; /**< Whether to support HE-MCS 0 to 9. The default value is 0. */
573+
uint32_t he_mcs9_enabled: 1; /**< Whether to support HE-MCS8 and HE-MCS9. The default value is 0. */
574574
uint32_t he_su_beamformee_disabled: 1; /**< Whether to disable support for operation as an SU beamformee. */
575575
uint32_t he_trig_su_bmforming_feedback_disabled: 1; /**< Whether to disable support the transmission of SU feedback in an HE TB sounding sequence. */
576576
uint32_t he_trig_mu_bmforming_partial_feedback_disabled: 1; /**< Whether to disable support the transmission of partial-bandwidth MU feedback in an HE TB sounding sequence. */
577577
uint32_t he_trig_cqi_feedback_disabled: 1; /**< Whether to disable support the transmission of CQI feedback in an HE TB sounding sequence. */
578-
uint32_t he_reserved: 22; /**< Reserved for future feature set */
579-
uint8_t sae_h2e_identifier[SAE_H2E_IDENTIFIER_LEN]; /**< Password identifier for H2E. this needs to be null terminated string */
578+
uint32_t vht_su_beamformee_disabled: 1; /**< Whether to disable support for operation as an VHT SU beamformee. */
579+
uint32_t vht_mu_beamformee_disabled: 1; /**< Whether to disable support for operation as an VHT MU beamformee. */
580+
uint32_t vht_mcs8_enabled: 1; /**< Whether to support VHT-MCS8. The default value is 0. */
581+
uint32_t reserved2: 19; /**< Reserved for future feature set */
582+
uint8_t sae_h2e_identifier[SAE_H2E_IDENTIFIER_LEN];/**< Password identifier for H2E. this needs to be null terminated string */
580583
} wifi_sta_config_t;
581584

582585
/**

0 commit comments

Comments
 (0)