Skip to content

Commit 2e53b81

Browse files
committed
fix(wifi_remote): Update per espressif/esp-idf@27f61966
1 parent 1a57a87 commit 2e53b81

File tree

9 files changed

+416
-57
lines changed

9 files changed

+416
-57
lines changed

components/esp_wifi_remote/Kconfig

Lines changed: 71 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,10 @@ menu "Wi-Fi Remote"
250250
range 6 32
251251
default 32
252252
help
253-
Set the number of WiFi management short buffer.
253+
Set the maximum number of Wi-Fi management short buffers. These buffers are dynamically allocated,
254+
with their size determined by the length of the management packet to be sent. When a management
255+
packet is less than 64 bytes, the Wi-Fi driver classifies it as a short management packet and
256+
assigns it to one of these buffers.
254257

255258
config ESP_WIFI_IRAM_OPT
256259
bool "WiFi IRAM speed optimization"
@@ -263,7 +266,7 @@ menu "Wi-Fi Remote"
263266

264267
config ESP_WIFI_EXTRA_IRAM_OPT
265268
bool "WiFi EXTRA IRAM speed optimization"
266-
default y if SLAVE_IDF_TARGET_ESP32C6
269+
default y if SLAVE_SOC_WIFI_HE_SUPPORT
267270
default n
268271
help
269272
Select this option to place additional frequently called Wi-Fi library functions
@@ -318,6 +321,7 @@ menu "Wi-Fi Remote"
318321
bool "WiFi SLP IRAM speed optimization"
319322
select PM_SLP_DEFAULT_PARAMS_OPT
320323
select PERIPH_CTRL_FUNC_IN_IRAM
324+
default y if SLAVE_SOC_WIFI_HE_SUPPORT
321325
help
322326
Select this option to place called Wi-Fi library TBTT process and receive beacon functions in IRAM.
323327
Some functions can be put in IRAM either by ESP_WIFI_IRAM_OPT and ESP_WIFI_RX_IRAM_OPT, or this one.
@@ -330,17 +334,30 @@ menu "Wi-Fi Remote"
330334
int "Minimum active time"
331335
range 8 60
332336
default 50
333-
depends on ESP_WIFI_SLP_IRAM_OPT
334337
help
335-
The minimum timeout for waiting to receive data, unit: milliseconds.
338+
Only for station in WIFI_PS_MIN_MODEM or WIFI_PS_MAX_MODEM. When the station enters the active state,
339+
it will work for at least ESP_WIFI_SLP_DEFAULT_MIN_ACTIVE_TIME. If a data packet is received or sent
340+
during this period, the time will be refreshed. If the time is up, but the station still has packets
341+
to receive or send, the time will also be refreshed. unit: milliseconds.
336342

337343
config ESP_WIFI_SLP_DEFAULT_MAX_ACTIVE_TIME
338344
int "Maximum keep alive time"
339345
range 10 60
340346
default 10
341-
depends on ESP_WIFI_SLP_IRAM_OPT
342347
help
343-
The maximum time that wifi keep alive, unit: seconds.
348+
Only for station in WIFI_PS_MIN_MODEM or WIFI_PS_MAX_MODEM. If no packet has been
349+
sent within ESP_WIFI_SLP_DEFAULT_MAX_ACTIVE_TIME, a null data packet will be sent
350+
to maintain the connection with the AP. unit: seconds.
351+
352+
config ESP_WIFI_SLP_DEFAULT_WAIT_BROADCAST_DATA_TIME
353+
int "Minimum wait broadcast data time"
354+
range 10 30
355+
default 15
356+
help
357+
Only for station in WIFI_PS_MIN_MODEM or WIFI_PS_MAX_MODEM. When the station knows through the beacon
358+
that AP will send broadcast packet, it will wait for ESP_WIFI_SLP_DEFAULT_WAIT_BROADCAST_DATA_TIME
359+
before entering the sleep process. If a broadcast packet is received with more data bits, the time
360+
will refreshed. unit: milliseconds.
344361

345362
config ESP_WIFI_FTM_ENABLE
346363
bool "WiFi FTM"
@@ -375,7 +392,7 @@ menu "Wi-Fi Remote"
375392

376393
config ESP_WIFI_GMAC_SUPPORT
377394
bool "WiFi GMAC Support(GMAC128 and GMAC256)"
378-
default n
395+
default y
379396
help
380397
Select this option to enable GMAC support. GMAC support is compulsory for WiFi 192 bit certification.
381398

@@ -453,14 +470,6 @@ menu "Wi-Fi Remote"
453470
help
454471
Enable WiFi Aware (NAN) feature.
455472

456-
config ESP_WIFI_ENABLE_WIFI_TX_STATS
457-
bool "Enable Wi-Fi transmission statistics"
458-
depends on SLAVE_SOC_WIFI_HE_SUPPORT
459-
default "y"
460-
help
461-
Enable Wi-Fi transmission statistics. Total support 4 access category. Each access category
462-
will use 346 bytes memory.
463-
464473
config ESP_WIFI_MBEDTLS_CRYPTO
465474
bool "Use MbedTLS crypto APIs"
466475
default y
@@ -597,21 +606,66 @@ menu "Wi-Fi Remote"
597606
help
598607
Select this option to enable WPS registrar support in softAP mode.
599608

609+
config ESP_WIFI_ENABLE_WIFI_TX_STATS
610+
bool "Enable Wi-Fi transmission statistics"
611+
depends on SLAVE_SOC_WIFI_HE_SUPPORT
612+
default n
613+
help
614+
Enable Wi-Fi transmission statistics. Total support 4 access category. Each access category
615+
will use 346 bytes memory.
616+
600617
config ESP_WIFI_ENABLE_WIFI_RX_STATS
601618
bool "Enable Wi-Fi reception statistics"
602619
depends on SLAVE_SOC_WIFI_HE_SUPPORT
603-
default "y"
620+
default n
604621
help
605622
Enable Wi-Fi reception statistics. Total support 2 access category. Each access category
606623
will use 190 bytes memory.
607624

608625
config ESP_WIFI_ENABLE_WIFI_RX_MU_STATS
609626
bool "Enable Wi-Fi DL MU-MIMO and DL OFDMA reception statistics"
610627
depends on ESP_WIFI_ENABLE_WIFI_RX_STATS
611-
default "y"
628+
default n
612629
help
613630
Enable Wi-Fi DL MU-MIMO and DL OFDMA reception statistics. Will use 10932 bytes memory.
614631

632+
config ESP_WIFI_TX_HETB_QUEUE_NUM
633+
int "WiFi TX HE TB QUEUE number for STA HE TB PPDU transmission"
634+
depends on SLAVE_SOC_WIFI_HE_SUPPORT
635+
range 1 4
636+
default 3
637+
help
638+
Set the maximum number of queue that can be aggregated by the STA in the A-MPDU carried in the
639+
HE TB PPDU.
640+
641+
config ESP_WIFI_ENABLE_DUMP_HESIGB
642+
bool "Enable Wi-Fi dump HE-SIGB which is contained in DL HE MU PPDUs"
643+
depends on SLAVE_SOC_WIFI_HE_SUPPORT_5G
644+
default "n"
645+
help
646+
Enable Wi-Fi dump HE-SIGB which is contained in DL HE MU PPDUs.
647+
648+
config ESP_WIFI_ENABLE_DUMP_MU_CFO
649+
bool "Enable Wi-Fi dump MU CFO"
650+
depends on SLAVE_SOC_WIFI_HE_SUPPORT_5G
651+
default "n"
652+
help
653+
Enable Wi-Fi dump MU CFO.
654+
655+
config ESP_WIFI_ENABLE_DUMP_CTRL_NDPA
656+
bool "Enable Wi-Fi dump NDPA frames"
657+
depends on SLAVE_SOC_WIFI_HE_SUPPORT_5G
658+
default "n"
659+
help
660+
Enable Wi-Fi dump NDPA frames.
661+
662+
config ESP_WIFI_ENABLE_DUMP_CTRL_BFRP
663+
bool "Enable Wi-Fi dump BFRP frames"
664+
depends on SLAVE_SOC_WIFI_HE_SUPPORT_5G
665+
default "n"
666+
help
667+
Enable Wi-Fi dump BFRP frames.
668+
615669
menu "WPS Configuration Options"
616670
config ESP_WIFI_WPS_STRICT
617671
bool "Strictly validate all WPS attributes"

components/esp_wifi_remote/esp_wifi_remote_weak.c

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,16 @@ WEAK esp_err_t esp_wifi_remote_scan_start(const wifi_scan_config_t *config, _Boo
7171
LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
7272
}
7373

74+
WEAK esp_err_t esp_wifi_remote_set_scan_parameters(const wifi_scan_default_params_t *config)
75+
{
76+
LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
77+
}
78+
79+
WEAK esp_err_t esp_wifi_remote_get_scan_parameters(wifi_scan_default_params_t *config)
80+
{
81+
LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
82+
}
83+
7484
WEAK esp_err_t esp_wifi_remote_scan_stop(void)
7585
{
7686
LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
@@ -266,6 +276,11 @@ WEAK esp_err_t esp_wifi_remote_set_csi_config(const wifi_csi_config_t *config)
266276
LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
267277
}
268278

279+
WEAK esp_err_t esp_wifi_remote_get_csi_config(wifi_csi_config_t *config)
280+
{
281+
LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
282+
}
283+
269284
WEAK esp_err_t esp_wifi_remote_set_csi(_Bool en)
270285
{
271286
LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
@@ -375,3 +390,43 @@ WEAK esp_err_t esp_wifi_remote_sta_get_rssi(int *rssi)
375390
{
376391
LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
377392
}
393+
394+
WEAK esp_err_t esp_wifi_remote_set_band(wifi_band_t band)
395+
{
396+
LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
397+
}
398+
399+
WEAK esp_err_t esp_wifi_remote_get_band(wifi_band_t *band)
400+
{
401+
LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
402+
}
403+
404+
WEAK esp_err_t esp_wifi_remote_set_band_mode(wifi_band_mode_t band_mode)
405+
{
406+
LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
407+
}
408+
409+
WEAK esp_err_t esp_wifi_remote_get_band_mode(wifi_band_mode_t *band_mode)
410+
{
411+
LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
412+
}
413+
414+
WEAK esp_err_t esp_wifi_remote_set_protocols(wifi_interface_t ifx, wifi_protocols_t *protocols)
415+
{
416+
LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
417+
}
418+
419+
WEAK esp_err_t esp_wifi_remote_get_protocols(wifi_interface_t ifx, wifi_protocols_t *protocols)
420+
{
421+
LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
422+
}
423+
424+
WEAK esp_err_t esp_wifi_remote_set_bandwidths(wifi_interface_t ifx, wifi_bandwidths_t *bw)
425+
{
426+
LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
427+
}
428+
429+
WEAK esp_err_t esp_wifi_remote_get_bandwidths(wifi_interface_t ifx, wifi_bandwidths_t *bw)
430+
{
431+
LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
432+
}

components/esp_wifi_remote/esp_wifi_with_remote.c

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,16 @@ esp_err_t esp_wifi_scan_start(const wifi_scan_config_t *config, _Bool block)
6767
return esp_wifi_remote_scan_start(config, block);
6868
}
6969

70+
esp_err_t esp_wifi_set_scan_parameters(const wifi_scan_default_params_t *config)
71+
{
72+
return esp_wifi_remote_set_scan_parameters(config);
73+
}
74+
75+
esp_err_t esp_wifi_get_scan_parameters(wifi_scan_default_params_t *config)
76+
{
77+
return esp_wifi_remote_get_scan_parameters(config);
78+
}
79+
7080
esp_err_t esp_wifi_scan_stop(void)
7181
{
7282
return esp_wifi_remote_scan_stop();
@@ -262,6 +272,11 @@ esp_err_t esp_wifi_set_csi_config(const wifi_csi_config_t *config)
262272
return esp_wifi_remote_set_csi_config(config);
263273
}
264274

275+
esp_err_t esp_wifi_get_csi_config(wifi_csi_config_t *config)
276+
{
277+
return esp_wifi_remote_get_csi_config(config);
278+
}
279+
265280
esp_err_t esp_wifi_set_csi(_Bool en)
266281
{
267282
return esp_wifi_remote_set_csi(en);
@@ -371,3 +386,43 @@ esp_err_t esp_wifi_sta_get_rssi(int *rssi)
371386
{
372387
return esp_wifi_remote_sta_get_rssi(rssi);
373388
}
389+
390+
esp_err_t esp_wifi_set_band(wifi_band_t band)
391+
{
392+
return esp_wifi_remote_set_band(band);
393+
}
394+
395+
esp_err_t esp_wifi_get_band(wifi_band_t *band)
396+
{
397+
return esp_wifi_remote_get_band(band);
398+
}
399+
400+
esp_err_t esp_wifi_set_band_mode(wifi_band_mode_t band_mode)
401+
{
402+
return esp_wifi_remote_set_band_mode(band_mode);
403+
}
404+
405+
esp_err_t esp_wifi_get_band_mode(wifi_band_mode_t *band_mode)
406+
{
407+
return esp_wifi_remote_get_band_mode(band_mode);
408+
}
409+
410+
esp_err_t esp_wifi_set_protocols(wifi_interface_t ifx, wifi_protocols_t *protocols)
411+
{
412+
return esp_wifi_remote_set_protocols(ifx, protocols);
413+
}
414+
415+
esp_err_t esp_wifi_get_protocols(wifi_interface_t ifx, wifi_protocols_t *protocols)
416+
{
417+
return esp_wifi_remote_get_protocols(ifx, protocols);
418+
}
419+
420+
esp_err_t esp_wifi_set_bandwidths(wifi_interface_t ifx, wifi_bandwidths_t *bw)
421+
{
422+
return esp_wifi_remote_set_bandwidths(ifx, bw);
423+
}
424+
425+
esp_err_t esp_wifi_get_bandwidths(wifi_interface_t ifx, wifi_bandwidths_t *bw)
426+
{
427+
return esp_wifi_remote_get_bandwidths(ifx, bw);
428+
}

components/esp_wifi_remote/include/esp_wifi_remote_api.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ esp_err_t esp_wifi_remote_disconnect(void);
1717
esp_err_t esp_wifi_remote_clear_fast_connect(void);
1818
esp_err_t esp_wifi_remote_deauth_sta(uint16_t aid);
1919
esp_err_t esp_wifi_remote_scan_start(const wifi_scan_config_t *config, _Bool block);
20+
esp_err_t esp_wifi_remote_set_scan_parameters(const wifi_scan_default_params_t *config);
21+
esp_err_t esp_wifi_remote_get_scan_parameters(wifi_scan_default_params_t *config);
2022
esp_err_t esp_wifi_remote_scan_stop(void);
2123
esp_err_t esp_wifi_remote_scan_get_ap_num(uint16_t *number);
2224
esp_err_t esp_wifi_remote_scan_get_ap_records(uint16_t *number, wifi_ap_record_t *ap_records);
@@ -56,6 +58,7 @@ esp_err_t esp_wifi_remote_get_event_mask(uint32_t *mask);
5658
esp_err_t esp_wifi_remote_80211_tx(wifi_interface_t ifx, const void *buffer, int len, _Bool en_sys_seq);
5759
esp_err_t esp_wifi_remote_set_csi_rx_cb(wifi_csi_cb_t cb, void *ctx);
5860
esp_err_t esp_wifi_remote_set_csi_config(const wifi_csi_config_t *config);
61+
esp_err_t esp_wifi_remote_get_csi_config(wifi_csi_config_t *config);
5962
esp_err_t esp_wifi_remote_set_csi(_Bool en);
6063
int64_t esp_wifi_remote_get_tsf_time(wifi_interface_t interface);
6164
esp_err_t esp_wifi_remote_set_inactive_time(wifi_interface_t ifx, uint16_t sec);
@@ -78,3 +81,11 @@ esp_err_t esp_wifi_remote_sta_get_aid(uint16_t *aid);
7881
esp_err_t esp_wifi_remote_sta_get_negotiated_phymode(wifi_phy_mode_t *phymode);
7982
esp_err_t esp_wifi_remote_set_dynamic_cs(_Bool enabled);
8083
esp_err_t esp_wifi_remote_sta_get_rssi(int *rssi);
84+
esp_err_t esp_wifi_remote_set_band(wifi_band_t band);
85+
esp_err_t esp_wifi_remote_get_band(wifi_band_t *band);
86+
esp_err_t esp_wifi_remote_set_band_mode(wifi_band_mode_t band_mode);
87+
esp_err_t esp_wifi_remote_get_band_mode(wifi_band_mode_t *band_mode);
88+
esp_err_t esp_wifi_remote_set_protocols(wifi_interface_t ifx, wifi_protocols_t *protocols);
89+
esp_err_t esp_wifi_remote_get_protocols(wifi_interface_t ifx, wifi_protocols_t *protocols);
90+
esp_err_t esp_wifi_remote_set_bandwidths(wifi_interface_t ifx, wifi_bandwidths_t *bw);
91+
esp_err_t esp_wifi_remote_get_bandwidths(wifi_interface_t ifx, wifi_bandwidths_t *bw);

0 commit comments

Comments
 (0)