From 27c89c3adcdc6e7d7e0cedab62901e4184cf52b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Quentin?= Date: Mon, 8 Sep 2025 09:09:04 +0200 Subject: [PATCH] Fix wifi event names (#4065) * Fix wifi event names * CHANGELOG.md --------- Co-authored-by: Juraj Sadel --- esp-radio/CHANGELOG.md | 1 + esp-radio/src/wifi/event.rs | 30 +++++++++++++------------- esp-radio/src/wifi/mod.rs | 6 +++--- examples/wifi/access_point/src/main.rs | 6 +++--- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/esp-radio/CHANGELOG.md b/esp-radio/CHANGELOG.md index 9dbc3a08c..8195bc863 100644 --- a/esp-radio/CHANGELOG.md +++ b/esp-radio/CHANGELOG.md @@ -47,6 +47,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed a BLE panic caused by unimplemented functions (#3762) - Fixed the BLE stack crashing in certain cases (#3854) - `ADC2` now cannot be used simultaneously with `radio` on ESP32 (#3876) +- Fixed names of some Wi-Fi events: ApStaConnected, ApStaDisconnected, ApProbeReqReceived (#4065) - BLE on ESP32-C2 with 26MHz xtal (#4062) ### Removed diff --git a/esp-radio/src/wifi/event.rs b/esp-radio/src/wifi/event.rs index 0665f8d15..a672c4741 100644 --- a/esp-radio/src/wifi/event.rs +++ b/esp-radio/src/wifi/event.rs @@ -39,14 +39,14 @@ fn default_handler() -> Box> { /// /// ```rust, no_run /// # use esp_radio::wifi::event::{self, *}; -/// # fn new_handler(_: &ApStaconnected) {} -/// event::ApStaconnected::update_handler(|_cs, event| { +/// # fn new_handler(_: &ApStaConnected) {} +/// event::ApStaConnected::update_handler(|_cs, event| { /// new_handler(event); /// }) /// ``` // Implemented like this instead of free functions because the syntax would be // ``` -// event::update_handler::(...) +// event::update_handler::(...) // ``` #[instability::unstable] pub trait EventExt: sealed::Event + Sized + 'static { @@ -131,9 +131,9 @@ impl_wifi_event!(StaWpsErPin, wifi_event_sta_wps_er_pin_t); impl_wifi_event!(StaWpsErPbcOverlap); impl_wifi_event!(ApStart); impl_wifi_event!(ApStop); -impl_wifi_event!(ApStaconnected, wifi_event_ap_staconnected_t); -impl_wifi_event!(ApStadisconnected, wifi_event_ap_stadisconnected_t); -impl_wifi_event!(ApProbereqrecved, wifi_event_ap_probe_req_rx_t); +impl_wifi_event!(ApStaConnected, wifi_event_ap_staconnected_t); +impl_wifi_event!(ApStaDisconnected, wifi_event_ap_stadisconnected_t); +impl_wifi_event!(ApProbeReqReceived, wifi_event_ap_probe_req_rx_t); impl_wifi_event!(FtmReport, wifi_event_ftm_report_t); impl_wifi_event!(StaBssRssiLow, wifi_event_bss_rssi_low_t); impl_wifi_event!(ActionTxStatus, wifi_event_action_tx_status_t); @@ -175,7 +175,7 @@ impl_wifi_event!(NdpTerminated, wifi_event_ndp_terminated_t); impl_wifi_event!(HomeChannelChange, wifi_event_home_channel_change_t); impl_wifi_event!(StaNeighborRep, wifi_event_neighbor_report_t); -impl ApStaconnected { +impl ApStaConnected { /// Get the MAC address of the connected station. pub fn mac(&self) -> &[u8] { &self.0.mac @@ -187,7 +187,7 @@ impl ApStaconnected { } } -impl ApStadisconnected { +impl ApStaDisconnected { /// Get the MAC address of the disconnected station. pub fn mac(&self) -> &[u8] { &self.0.mac @@ -343,7 +343,7 @@ impl FtmReport { } } -impl ApProbereqrecved { +impl ApProbeReqReceived { /// Get received probe request SSID. pub fn rssi(&self) -> i32 { self.0.rssi @@ -806,14 +806,14 @@ pub(crate) unsafe fn dispatch_event_handler( WifiEvent::ApStop => { handle_raw::(event_data, event_data_size) } - WifiEvent::ApStaconnected => { - handle_raw::(event_data, event_data_size) + WifiEvent::ApStaConnected => { + handle_raw::(event_data, event_data_size) } - WifiEvent::ApStadisconnected => { - handle_raw::(event_data, event_data_size) + WifiEvent::ApStaDisconnected => { + handle_raw::(event_data, event_data_size) } - WifiEvent::ApProbereqrecved => { - handle_raw::(event_data, event_data_size) + WifiEvent::ApProbeReqReceived => { + handle_raw::(event_data, event_data_size) } WifiEvent::FtmReport => { handle_raw::(event_data, event_data_size) diff --git a/esp-radio/src/wifi/mod.rs b/esp-radio/src/wifi/mod.rs index ce524af28..171dd2442 100644 --- a/esp-radio/src/wifi/mod.rs +++ b/esp-radio/src/wifi/mod.rs @@ -1174,11 +1174,11 @@ pub enum WifiEvent { /// Soft-AP stop. ApStop, /// A station connected to Soft-AP. - ApStaconnected, + ApStaConnected, /// A station disconnected from Soft-AP. - ApStadisconnected, + ApStaDisconnected, /// Received probe request packet in Soft-AP interface. - ApProbereqrecved, + ApProbeReqReceived, /// Received report of FTM procedure. FtmReport, diff --git a/examples/wifi/access_point/src/main.rs b/examples/wifi/access_point/src/main.rs index 20da9ce48..be858066b 100644 --- a/examples/wifi/access_point/src/main.rs +++ b/examples/wifi/access_point/src/main.rs @@ -48,14 +48,14 @@ fn main() -> ! { // Set event handlers for wifi before init to avoid missing any. let mut connections = 0u32; _ = event::ApStart::replace_handler(|_| println!("ap start event")); - event::ApStaconnected::update_handler(move |event| { + event::ApStaConnected::update_handler(move |event| { connections += 1; esp_println::println!("connected {}, mac: {:?}", connections, event.mac()); }); - event::ApStaconnected::update_handler(|event| { + event::ApStaConnected::update_handler(|event| { esp_println::println!("connected aid: {}", event.aid()); }); - event::ApStadisconnected::update_handler(|event| { + event::ApStaDisconnected::update_handler(|event| { println!( "disconnected mac: {:?}, reason: {:?}", event.mac(),