itsscb/esp-hal
1
0
Fork 0
mirror of https://github.com/esp-rs/esp-hal.git synced 2025-09-27 12:20:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop using ok in esp-wifi/esp-ieee802154 crates codebase. (#3853)

Browse Source 
* is that it?

* `expect` <-> `unwrap`

* macro update

fix macro

* how did i manage to forget..?
This commit is contained in:
Kirill Mikhailov 2025-07-24 10:36:04 +02:00 committed by GitHub
parent 818d30972d
commit a2f2a224cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
esp-wifi/src/esp_now/mod.rs
View File

@ -52,6 +52,19 @@ macro_rules! check_error {
};
}
macro_rules! check_error_expect {
($block:block, $msg:literal) => {
match unsafe { $block } {
0 => (),
res => panic!(
"{}: {:?}",
$msg,
EspNowError::Error(Error::from_code(res as u32))
),
}
};
}
/// Internal errors that can occur with ESP-NOW.
#[repr(u32)]
#[derive(Debug)]
@ -621,9 +634,15 @@ impl<'d> EspNow<'d> {
_phantom: PhantomData,
};
check_error!({ esp_now_init() }).expect("esp-now-init failed");
check_error!({ esp_now_register_recv_cb(Some(rcv_cb)) }).ok();
check_error!({ esp_now_register_send_cb(Some(send_cb)) }).ok();
check_error_expect!({ esp_now_init() }, "esp-now-init failed");
check_error_expect!(
{ esp_now_register_recv_cb(Some(rcv_cb)) },
"receiving callback failed"
);
check_error_expect!(
{ esp_now_register_send_cb(Some(send_cb)) },
"sending callback failed"
);
esp_now
.add_peer(PeerInfo {
@ -633,7 +652,7 @@ impl<'d> EspNow<'d> {
channel: None,
encrypt: false,
})
.ok();
.expect("adding peer failed");
esp_now
}