minor refactor for flavor

This commit is contained in:
Andy Killorin 2024-10-30 10:43:05 -04:00
parent 249b8118aa
commit 763db5f983
Signed by: ank
GPG key ID: 23F9463ECB67FE8C

View file

@ -50,8 +50,6 @@ bind_interrupts!(struct Irqs {
static READ_CARD: Mutex<RefCell<u64>> = static READ_CARD: Mutex<RefCell<u64>> =
Mutex::new(RefCell::new(0)); Mutex::new(RefCell::new(0));
static BIT: AtomicU8 = AtomicU8::new(0); static BIT: AtomicU8 = AtomicU8::new(0);
static DATA_IN: Mutex<RefCell<Option<(Input, Input)>>> =
Mutex::new(RefCell::new(None));
#[embassy_executor::task] #[embassy_executor::task]
async fn logger_task(driver: Driver<'static, USB>) { async fn logger_task(driver: Driver<'static, USB>) {
@ -68,27 +66,26 @@ async fn net_task(mut runner: embassy_net::Runner<'static, cyw43::NetDriver<'sta
runner.run().await runner.run().await
} }
static LAST_BIT: AtomicU8 = AtomicU8::new(0);
#[embassy_executor::task] #[embassy_executor::task]
async fn print_task() -> ! { async fn data_extractor() -> ! {
let mut last_bit = 0; let mut last_bit = 0;
loop { loop {
Timer::after_millis(250).await; Timer::after_millis(75).await;
let card = critical_section::with(|cs| { let card = critical_section::with(|cs| {
READ_CARD.borrow(cs).clone().into_inner() READ_CARD.borrow(cs).clone().into_inner()
}); });
let bit = BIT.load(core::sync::atomic::Ordering::SeqCst); let bit = BIT.load(core::sync::atomic::Ordering::SeqCst);
if bit == last_bit { if bit == last_bit {
if card !=0 { if card !=0 {
info!("thi ting: {card:#x}"); info!("read a card: {card:#16x}");
} }
critical_section::with(|cs| { critical_section::with(|cs| {
READ_CARD.replace(cs, 0); READ_CARD.replace(cs, 0);
}); });
BIT.store(0, core::sync::atomic::Ordering::SeqCst);
} }
last_bit = bit; last_bit = bit;
info!("ro: {card:#x}, bit: {bit}");
} }
} }
@ -158,7 +155,7 @@ async fn main(spawner: Spawner) {
let mut tx_buffer = [0; 4096]; let mut tx_buffer = [0; 4096];
let mut buf = [0; 4096]; let mut buf = [0; 4096];
spawner.spawn(print_task()).unwrap(); spawner.spawn(data_extractor()).unwrap();
let mut partial: u64 = 0; let mut partial: u64 = 0;
let mut bit: u8 = 0; let mut bit: u8 = 0;