LailaTheElf/embassy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3617 from embassy-rs/nfct-fixes

Browse Source 
nrf/nfct: two fixes
This commit is contained in:
Dario Nieuwenhuis 2024-12-06 10:37:10 +00:00 committed by GitHub
commit 65d2dbcc3a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,6 +215,12 @@ impl<'d> NfcT<'d> {
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| {
@ -259,12 +265,6 @@ impl<'d> NfcT<'d> {
continue; continue;
} }
// TODO: add support for "window" frame delay, which is technically
// needed to be compliant with iso14443-4
r.framedelaymode().write(|w| {
w.set_framedelaymode(vals::Framedelaymode::FREE_RUN);
});
// disable autocoll // disable autocoll
#[cfg(not(feature = "nrf52832"))] #[cfg(not(feature = "nrf52832"))]
r.autocolresconfig().write(|w| w.0 = 0b11u32); r.autocolresconfig().write(|w| w.0 = 0b11u32);
@ -328,7 +328,9 @@ impl<'d> NfcT<'d> {
if r.events_error().read() != 0 { if r.events_error().read() != 0 {
trace!("Got error?"); trace!("Got error?");
warn!("errors: {:08x}", r.errorstatus().read().0); let errs = r.errorstatus().read();
r.errorstatus().write(|w| w.0 = 0xFFFF_FFFF);
trace!("errors: {:08x}", errs.0);
r.events_error().write_value(0); r.events_error().write_value(0);
return Poll::Ready(Err(Error::RxError)); return Poll::Ready(Err(Error::RxError));
} }
@ -382,7 +384,9 @@ impl<'d> NfcT<'d> {
if r.events_rxerror().read() != 0 { if r.events_rxerror().read() != 0 {
trace!("RXerror got in recv frame, should be back in idle state"); trace!("RXerror got in recv frame, should be back in idle state");
r.events_rxerror().write_value(0); r.events_rxerror().write_value(0);
warn!("errors: {:08x}", r.errorstatus().read().0); let errs = r.framestatus().rx().read();
r.framestatus().rx().write(|w| w.0 = 0xFFFF_FFFF);
trace!("errors: {:08x}", errs.0);
return Poll::Ready(Err(Error::RxError)); return Poll::Ready(Err(Error::RxError));
} }