itsscb/embassy
1
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2025-10-02 14:44:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

nrf/nfct: actually fix frame timing.

Browse Source 
Now it works both with android and iOS, and both with and without logs.
This commit is contained in:
Dario Nieuwenhuis 2024-12-07 22:03:23 +01:00
parent a869c3d1fe
commit d1df927c03
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
embassy-nrf/src/nfct.rs
View File

@ -212,15 +212,13 @@ impl<'d> NfcT<'d> {
#[cfg(not(feature = "nrf52832"))] #[cfg(not(feature = "nrf52832"))]
r.autocolresconfig().write(|w| w.0 = 0b10); r.autocolresconfig().write(|w| w.0 = 0b10);
// framedelaymax=4096 is needed to make it work with phones from
// a certain company named after some fruit.
r.framedelaymin().write(|w| w.set_framedelaymin(1152));
r.framedelaymax().write(|w| w.set_framedelaymax(4096));
r.framedelaymode().write(|w| { r.framedelaymode().write(|w| {
w.set_framedelaymode(vals::Framedelaymode::WINDOW_GRID); w.set_framedelaymode(vals::Framedelaymode::WINDOW_GRID);
}); });
r.framedelaymin().write(|w| {
w.set_framedelaymin(1152);
});
r.framedelaymax().write(|w| {
w.set_framedelaymax(0xFFFF); // max
});
info!("waiting for field"); info!("waiting for field");
poll_fn(|cx| { poll_fn(|cx| {
@ -269,6 +267,17 @@ impl<'d> NfcT<'d> {
#[cfg(not(feature = "nrf52832"))] #[cfg(not(feature = "nrf52832"))]
r.autocolresconfig().write(|w| w.0 = 0b11u32); r.autocolresconfig().write(|w| w.0 = 0b11u32);
// once anticoll is done, set framedelaymax to the maximum possible.
// this gives the firmware as much time as possible to reply.
// higher layer still has to reply faster than the FWT it specifies in the iso14443-4 ATS,
// but that's not our concern.
//
// nrf52832 field is 16bit instead of 20bit. this seems to force a too short timeout, maybe it's a SVD bug?
#[cfg(not(feature = "nrf52832"))]
r.framedelaymax().write(|w| w.set_framedelaymax(0xF_FFFF));
#[cfg(feature = "nrf52832")]
r.framedelaymax().write(|w| w.set_framedelaymax(0xFFFF));
return; return;
} }
} }