Skip to content

Commit 551711f

Browse files
feature(update_wifi_structs): updated structs for sta and softap
- added channel bitmaps (2.4GHz and 5GHz) to RPC scan structure - updated structure definitions for station and softap to match with latest ESP-IDF Wi-Fi headers - added defines to control compilation of parts that are structure specific to ESP-IDF 5.4.0 or 5.5.0
1 parent 5c1a1f1 commit 551711f

File tree

8 files changed

+599
-66
lines changed

8 files changed

+599
-66
lines changed

common/proto/esp_hosted_rpc.pb-c.c

Lines changed: 321 additions & 12 deletions
Large diffs are not rendered by default.

common/proto/esp_hosted_rpc.pb-c.h

Lines changed: 128 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

common/proto/esp_hosted_rpc.proto

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,11 @@ message wifi_scan_time {
605605
cause station to disconnect from AP and are not recommended. */
606606
}
607607

608+
message wifi_scan_channel_bitmap {
609+
uint32 ghz_2_channels = 1; /**< Represents 2.4 GHz channels, that bits can be set as wifi_2g_channel_bit_t shown. */
610+
uint32 ghz_5_channels = 2; /**< Represents 5 GHz channels, that bits can be set as wifi_5g_channel_bit_t shown. */
611+
}
612+
608613
message wifi_scan_config {
609614
bytes ssid = 1; /**< SSID of AP 33char*/
610615
bytes bssid = 2; /**< MAC address of AP 6char */
@@ -613,6 +618,9 @@ message wifi_scan_config {
613618
int32 scan_type = 5; /**< scan type, active or passive */
614619
wifi_scan_time scan_time = 6; /**< scan time per channel */
615620
uint32 home_chan_dwell_time = 7; /**< time spent at home channel between scanning consecutive channels.*/
621+
wifi_scan_channel_bitmap channel_bitmap = 8; /**< Channel bitmap for setting specific channels to be scanned.
622+
Please note that the 'channel' parameter above needs to be set to 0 to allow scanning by bitmap.
623+
Also, note that only allowed channels configured by wifi_country_t can be scanned. */
616624
}
617625

618626
message wifi_he_ap_info {
@@ -661,13 +669,19 @@ message wifi_scan_threshold {
661669
Note: Incase this value is not set and password is set as per WPA2 standards(password len >= 8),
662670
it will be defaulted to WPA2 and device won't connect to deprecated WEP/WPA networks.
663671
Please set authmode threshold as WIFI_AUTH_WEP/WIFI_AUTH_WPA_PSK to connect to WEP/WPA networks */
672+
uint32 rssi_5g_adjustment = 3; /**< The RSSI value of the 5G AP is within the rssi_5g_adjustment range compared to the 2G AP, the 5G AP will be given priority for connection. */
664673
}
665674

666675
message wifi_pmf_config {
667676
bool capable = 1; /**< Deprecated variable. Device will always connect in PMF mode if other device also advertizes PMF capability. */
668677
bool required = 2; /**< Advertizes that Protected Management Frame is required. Device will not associate to non-PMF capable devices. */
669678
}
670679

680+
message wifi_bss_max_idle_config {
681+
uint32 period = 1; /**< Sets BSS Max idle period (1 Unit = 1000TUs OR 1.024 Seconds). If there are no frames for this period from a STA, SoftAP will disassociate due to inactivity. Setting it to 0 disables the feature */
682+
bool protected_keep_alive = 2; /**< Requires clients to use protected keep alive frames for BSS Max Idle period */
683+
}
684+
671685
message wifi_ap_config {
672686
bytes ssid = 1; /**< SSID of ESP32 soft-AP. If ssid_len field is 0, this must be a Null terminated string. Otherwise, length is set according to ssid_len. 32 char*/
673687
bytes password = 2; /**< Password of ESP32 soft-AP. 64 char*/
@@ -683,6 +697,12 @@ message wifi_ap_config {
683697
bool ftm_responder = 10; /**< Enable FTM Responder mode */
684698
wifi_pmf_config pmf_cfg = 11; /**< Configuration for Protected Management Frame */
685699
int32 sae_pwe_h2e = 12; /**< Configuration for SAE PWE derivation method */
700+
uint32 csa_count = 13; /**< Channel Switch Announcement Count. Notify the station that the channel will switch after the csa_count beacon intervals. Default value: 3 */
701+
uint32 dtim_period = 14; /**< Dtim period of soft-AP. Range: 1 ~ 10. Default value: 1 */
702+
uint32 transition_disable = 15; /**< Whether to enable transition disable feature */
703+
uint32 sae_ext = 16; /**< Enable SAE EXT feature. SOC_GCMP_SUPPORT is required for this feature. */
704+
wifi_bss_max_idle_config bss_max_idle_cfg = 17; /**< Configuration for bss max idle, effective if CONFIG_WIFI_BSS_MAX_IDLE_SUPPORT is enabled */
705+
uint32 gtk_rekey_interval = 18; /**< GTK rekeying interval in seconds. If set to 0, GTK rekeying is disabled. Range: 60 ~ 65535 including 0. */
686706
}
687707

688708
message wifi_sta_config {
@@ -720,9 +740,13 @@ Units: AP beacon intervals. Defaults to 3 if set to 0. */
720740
//uint32_t he_trig_su_bmforming_feedback_disabled:1; /**< Whether to disable support the transmission of SU feedback in an HE TB sounding sequence. */
721741
//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. */
722742
// uint32_t he_trig_cqi_feedback_disabled:1; /**< Whether to disable support the transmission of CQI feedback in an HE TB sounding sequence. */
723-
// uint32_t he_reserved:22; /**< Reserved for future feature set */
743+
// uint32_t vht_su_beamformee_disabled: 1; /**< Whether to disable support for operation as an VHT SU beamformee. */
744+
// uint32_t vht_mu_beamformee_disabled: 1; /**< Whether to disable support for operation as an VHT MU beamformee. */
745+
// uint32_t vht_mcs8_enabled: 1; /**< Whether to support VHT-MCS8. The default value is 0. */
746+
// uint32_t he_reserved:19; /**< Reserved for future feature set */
724747
uint32 he_bitmask = 14;
725748
bytes sae_h2e_identifier = 15; /**< Password identifier for H2E. this needs to be null terminated string. SAE_H2E_IDENTIFIER_LEN chars */
749+
uint32 sae_pk_mode = 16; /**< Configuration for SAE-PK (Public Key) Authentication method */
726750
}
727751

728752
message wifi_config {

0 commit comments

Comments
 (0)