fix: multiple things

Author: filipton

src/buttons.rs

@@ -1,4 +1,5 @@
 use crate::{
+    stackmat::CURRENT_TIME,
     state::{current_epoch, deeper_sleep_state, sleep_state, GlobalState, Scene},
     structs::DelegateResponsePacket,
     utils::buttons::{Button, ButtonTrigger, ButtonsHandler},
@@ -201,6 +202,10 @@ async fn inspection_start(
         return Ok(false);
     }
 
+    if unsafe { CURRENT_TIME } != 0 {
+        return Ok(false);
+    }
+
     if state_val.scene < Scene::Inspection
         && state_val.inspection_start.is_none()
         && state_val.solve_time.is_none()

src/rfid.rs

@@ -4,7 +4,7 @@ use crate::structs::{CardInfoResponsePacket, SolveConfirmPacket};
 use crate::translations::{get_translation, TranslationKey};
 use alloc::string::ToString;
 use anyhow::{anyhow, Result};
-use embassy_time::{Duration, Timer};
+use embassy_time::{Duration, Instant, Timer};
 use esp_hal::time::Rate;
 use esp_hal::{
     dma::{DmaRxBuf, DmaTxBuf},
@@ -78,6 +78,7 @@ pub async fn rfid_task(
     log::debug!("PCD ver: {:?}", mfrc522.pcd_get_version().await);
 
     let mut rfid_sleep = false;
+    let mut last_card = (0, Instant::now());
     loop {
         Timer::after(Duration::from_millis(10)).await;
         if sleep_state() != rfid_sleep {
@@ -119,6 +120,11 @@ pub async fn rfid_task(
         };
         log::info!("Card UID: {card_uid}");
 
+        if last_card.0 == card_uid && (Instant::now() - last_card.1).as_millis() < 500 {
+            continue;
+        }
+        last_card = (card_uid, Instant::now());
+
         #[cfg(feature = "qa")]
         {
             crate::qa::send_qa_resp(crate::qa::QaSignal::Rfid(card_uid));

src/stackmat.rs

@@ -10,6 +10,8 @@ use alloc::string::ToString;
 use embassy_time::{Instant, Timer};
 use esp_hal::{gpio::AnyPin, peripherals::UART1, uart::UartRx};
 
+pub static mut CURRENT_TIME: u64 = 0;
+
 #[embassy_executor::task]
 pub async fn stackmat_task(
     uart: UART1,
@@ -131,6 +133,10 @@ pub async fn stackmat_task(
                     crate::qa::send_qa_resp(crate::qa::QaSignal::StackmatConnected);
                 }
 
+                unsafe {
+                    CURRENT_TIME = parsed.1;
+                }
+
                 if parsed.0 != last_stackmat_state {
                     if parsed.0 == StackmatTimerState::Running {
                         let mut state = global_state.state.lock().await;