From 03082a9cdf65bbb675b47fc6b4ea657939fcf01b Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Fri, 6 Dec 2024 11:29:55 +0100
Subject: [PATCH 1/2] nrf/nfct: set correct frame delay timing.

This makes it work both with and without trace logging, before it would
only work with.
---
 embassy-nrf/src/nfct.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/embassy-nrf/src/nfct.rs b/embassy-nrf/src/nfct.rs
index 2756c7952..a79cc5840 100644
--- a/embassy-nrf/src/nfct.rs
+++ b/embassy-nrf/src/nfct.rs
@@ -215,6 +215,12 @@ impl<'d> NfcT<'d> {
             r.framedelaymode().write(|w| {
                 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");
             poll_fn(|cx| {
@@ -259,12 +265,6 @@ impl<'d> NfcT<'d> {
                 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
             #[cfg(not(feature = "nrf52832"))]
             r.autocolresconfig().write(|w| w.0 = 0b11u32);

From 0225221f8bfe71723f8673d9e316e9ab7d180782 Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Fri, 6 Dec 2024 11:30:33 +0100
Subject: [PATCH 2/2] nrf/nfct: use the right error register for rx and tx.

---
 embassy-nrf/src/nfct.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/embassy-nrf/src/nfct.rs b/embassy-nrf/src/nfct.rs
index a79cc5840..85866063a 100644
--- a/embassy-nrf/src/nfct.rs
+++ b/embassy-nrf/src/nfct.rs
@@ -328,7 +328,9 @@ impl<'d> NfcT<'d> {
 
             if r.events_error().read() != 0 {
                 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);
                 return Poll::Ready(Err(Error::RxError));
             }
@@ -382,7 +384,9 @@ impl<'d> NfcT<'d> {
             if r.events_rxerror().read() != 0 {
                 trace!("RXerror got in recv frame, should be back in idle state");
                 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));
             }