Skip to content

Commit 27c89c3

Browse files
bjoernQJurajSadel
andauthored
Fix wifi event names (#4065)
* Fix wifi event names * CHANGELOG.md --------- Co-authored-by: Juraj Sadel <[email protected]>
1 parent bea71a1 commit 27c89c3

File tree

4 files changed

+22
-21
lines changed

4 files changed

+22
-21
lines changed

esp-radio/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4747
- Fixed a BLE panic caused by unimplemented functions (#3762)
4848
- Fixed the BLE stack crashing in certain cases (#3854)
4949
- `ADC2` now cannot be used simultaneously with `radio` on ESP32 (#3876)
50+
- Fixed names of some Wi-Fi events: ApStaConnected, ApStaDisconnected, ApProbeReqReceived (#4065)
5051
- BLE on ESP32-C2 with 26MHz xtal (#4062)
5152

5253
### Removed

esp-radio/src/wifi/event.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ fn default_handler<Event: 'static>() -> Box<Handler<Event>> {
3939
///
4040
/// ```rust, no_run
4141
/// # use esp_radio::wifi::event::{self, *};
42-
/// # fn new_handler(_: &ApStaconnected) {}
43-
/// event::ApStaconnected::update_handler(|_cs, event| {
42+
/// # fn new_handler(_: &ApStaConnected) {}
43+
/// event::ApStaConnected::update_handler(|_cs, event| {
4444
/// new_handler(event);
4545
/// })
4646
/// ```
4747
// Implemented like this instead of free functions because the syntax would be
4848
// ```
49-
// event::update_handler::<event::ApStaconnected, _>(...)
49+
// event::update_handler::<event::ApStaConnected, _>(...)
5050
// ```
5151
#[instability::unstable]
5252
pub trait EventExt: sealed::Event + Sized + 'static {
@@ -131,9 +131,9 @@ impl_wifi_event!(StaWpsErPin, wifi_event_sta_wps_er_pin_t);
131131
impl_wifi_event!(StaWpsErPbcOverlap);
132132
impl_wifi_event!(ApStart);
133133
impl_wifi_event!(ApStop);
134-
impl_wifi_event!(ApStaconnected, wifi_event_ap_staconnected_t);
135-
impl_wifi_event!(ApStadisconnected, wifi_event_ap_stadisconnected_t);
136-
impl_wifi_event!(ApProbereqrecved, wifi_event_ap_probe_req_rx_t);
134+
impl_wifi_event!(ApStaConnected, wifi_event_ap_staconnected_t);
135+
impl_wifi_event!(ApStaDisconnected, wifi_event_ap_stadisconnected_t);
136+
impl_wifi_event!(ApProbeReqReceived, wifi_event_ap_probe_req_rx_t);
137137
impl_wifi_event!(FtmReport, wifi_event_ftm_report_t);
138138
impl_wifi_event!(StaBssRssiLow, wifi_event_bss_rssi_low_t);
139139
impl_wifi_event!(ActionTxStatus, wifi_event_action_tx_status_t);
@@ -175,7 +175,7 @@ impl_wifi_event!(NdpTerminated, wifi_event_ndp_terminated_t);
175175
impl_wifi_event!(HomeChannelChange, wifi_event_home_channel_change_t);
176176
impl_wifi_event!(StaNeighborRep, wifi_event_neighbor_report_t);
177177

178-
impl ApStaconnected {
178+
impl ApStaConnected {
179179
/// Get the MAC address of the connected station.
180180
pub fn mac(&self) -> &[u8] {
181181
&self.0.mac
@@ -187,7 +187,7 @@ impl ApStaconnected {
187187
}
188188
}
189189

190-
impl ApStadisconnected {
190+
impl ApStaDisconnected {
191191
/// Get the MAC address of the disconnected station.
192192
pub fn mac(&self) -> &[u8] {
193193
&self.0.mac
@@ -343,7 +343,7 @@ impl FtmReport {
343343
}
344344
}
345345

346-
impl ApProbereqrecved {
346+
impl ApProbeReqReceived {
347347
/// Get received probe request SSID.
348348
pub fn rssi(&self) -> i32 {
349349
self.0.rssi
@@ -806,14 +806,14 @@ pub(crate) unsafe fn dispatch_event_handler(
806806
WifiEvent::ApStop => {
807807
handle_raw::<ApStop>(event_data, event_data_size)
808808
}
809-
WifiEvent::ApStaconnected => {
810-
handle_raw::<ApStaconnected>(event_data, event_data_size)
809+
WifiEvent::ApStaConnected => {
810+
handle_raw::<ApStaConnected>(event_data, event_data_size)
811811
}
812-
WifiEvent::ApStadisconnected => {
813-
handle_raw::<ApStadisconnected>(event_data, event_data_size)
812+
WifiEvent::ApStaDisconnected => {
813+
handle_raw::<ApStaDisconnected>(event_data, event_data_size)
814814
}
815-
WifiEvent::ApProbereqrecved => {
816-
handle_raw::<ApProbereqrecved>(event_data, event_data_size)
815+
WifiEvent::ApProbeReqReceived => {
816+
handle_raw::<ApProbeReqReceived>(event_data, event_data_size)
817817
}
818818
WifiEvent::FtmReport => {
819819
handle_raw::<FtmReport>(event_data, event_data_size)

esp-radio/src/wifi/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,11 +1174,11 @@ pub enum WifiEvent {
11741174
/// Soft-AP stop.
11751175
ApStop,
11761176
/// A station connected to Soft-AP.
1177-
ApStaconnected,
1177+
ApStaConnected,
11781178
/// A station disconnected from Soft-AP.
1179-
ApStadisconnected,
1179+
ApStaDisconnected,
11801180
/// Received probe request packet in Soft-AP interface.
1181-
ApProbereqrecved,
1181+
ApProbeReqReceived,
11821182

11831183
/// Received report of FTM procedure.
11841184
FtmReport,

examples/wifi/access_point/src/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ fn main() -> ! {
4848
// Set event handlers for wifi before init to avoid missing any.
4949
let mut connections = 0u32;
5050
_ = event::ApStart::replace_handler(|_| println!("ap start event"));
51-
event::ApStaconnected::update_handler(move |event| {
51+
event::ApStaConnected::update_handler(move |event| {
5252
connections += 1;
5353
esp_println::println!("connected {}, mac: {:?}", connections, event.mac());
5454
});
55-
event::ApStaconnected::update_handler(|event| {
55+
event::ApStaConnected::update_handler(|event| {
5656
esp_println::println!("connected aid: {}", event.aid());
5757
});
58-
event::ApStadisconnected::update_handler(|event| {
58+
event::ApStaDisconnected::update_handler(|event| {
5959
println!(
6060
"disconnected mac: {:?}, reason: {:?}",
6161
event.mac(),

0 commit comments

Comments
 (0)