wip: card signing UI

Author: filipton

src/buttons.rs

@@ -155,6 +155,16 @@ async fn submit_up(
         return Ok(true);
     }
 
+    if unsafe { crate::state::SIGN_CARDS_MODE || crate::state::UNSIGN_CARDS_MODE } {
+        unsafe {
+            crate::state::SIGN_CARDS_MODE = false;
+            crate::state::UNSIGN_CARDS_MODE = false;
+        }
+
+        state.state.signal();
+        return Ok(true);
+    }
+
     if let Some(sel) = state_val.selected_config_menu {
         match sel {
             0 => {
@@ -175,10 +185,14 @@ async fn submit_up(
             2 => {
                 // Sign Cards
                 unsafe { crate::state::SIGN_CARDS_MODE = true };
+                // TODO: change this shit
+                // MAYBE make second scene set (for things like this)
             }
             3 => {
                 // Un-Sign Cards
                 unsafe { crate::state::UNSIGN_CARDS_MODE = true };
+                // TODO: change this shit
+                // MAYBE make second scene set (for things like this)
             }
             4 => {} // Exit
             _ => {

src/lcd.rs

@@ -222,6 +222,42 @@ async fn process_lcd<T: OutputPin, D: DelayNs>(
         return Some(());
     }
 
+    if unsafe { crate::state::SIGN_CARDS_MODE || crate::state::UNSIGN_CARDS_MODE } {
+        lcd_driver.clear_all().ok()?;
+        lcd_driver
+            .print(0, "Signing | Submit To Exit", PrintAlign::Left, true)
+            .ok()?;
+
+        if global_state.sign_unsign_progress.signaled() {
+            let status = if global_state.sign_unsign_progress.wait().await {
+                "OK"
+            } else {
+                "FAIL"
+            };
+
+            lcd_driver
+                .print(
+                    1,
+                    &alloc::format!("Operation {}", status),
+                    PrintAlign::Center,
+                    true,
+                )
+                .ok()?;
+            lcd_driver.display_on_lcd(lcd).await;
+
+            Timer::after_millis(300).await;
+            lcd_driver
+                .print(1, "Scan the card", PrintAlign::Center, true)
+                .ok()?;
+        } else {
+            lcd_driver
+                .print(1, "Scan the card", PrintAlign::Center, true)
+                .ok()?;
+        }
+
+        return Some(());
+    }
+
     let overwritten = process_lcd_overwrite(&current_state, global_state, lcd_driver).await;
     if overwritten {
         return Some(());

src/rfid.rs

@@ -158,10 +158,19 @@ pub async fn rfid_task(
                 let res = mfrc522.mifare_write(63, &buff, 16).await;
                 if let Err(e) = res {
                     log::error!("cannot unsecure card error: {e:?}");
+                    global_state.sign_unsign_progress.signal(false);
+                    global_state.state.signal();
                     _ = mfrc522.picc_halta().await;
                     _ = mfrc522.pcd_stop_crypto1().await;
                     continue;
                 }
+
+                global_state.sign_unsign_progress.signal(true);
+                global_state.state.signal();
+            } else {
+                log::error!("unsign auth failed!");
+                global_state.sign_unsign_progress.signal(false);
+                global_state.state.signal();
             }
 
             _ = mfrc522.picc_halta().await;
@@ -198,6 +207,8 @@ pub async fn rfid_task(
                 let res = mfrc522.mifare_write(63, &buff, 16).await;
                 if let Err(e) = res {
                     log::error!("write res: {e:?}");
+                    global_state.sign_unsign_progress.signal(false);
+                    global_state.state.signal();
                     _ = mfrc522.picc_halta().await;
                     _ = mfrc522.pcd_stop_crypto1().await;
                     continue;
@@ -214,6 +225,8 @@ pub async fn rfid_task(
                     .await;
                 if status.is_err() {
                     log::error!("Cannot auth card!");
+                    global_state.sign_unsign_progress.signal(false);
+                    global_state.state.signal();
                     _ = mfrc522.picc_halta().await;
                     _ = mfrc522.pcd_stop_crypto1().await;
                     continue;
@@ -224,10 +237,18 @@ pub async fn rfid_task(
                 let res = mfrc522.mifare_write(62, &buff, 16).await;
                 if res.is_err() {
                     log::error!("Cannot write secured rfid info!");
+                    global_state.sign_unsign_progress.signal(false);
+                    global_state.state.signal();
                     _ = mfrc522.picc_halta().await;
                     _ = mfrc522.pcd_stop_crypto1().await;
                     continue;
                 }
+
+                global_state.sign_unsign_progress.signal(true);
+                global_state.state.signal();
+            } else {
+                global_state.sign_unsign_progress.signal(false);
+                global_state.state.signal();
             }
 
             _ = mfrc522.picc_halta().await;

src/state.rs

@@ -133,6 +133,7 @@ pub struct GlobalStateInner {
     pub timer_signal: Signal<NoopRawMutex, u64>,
     pub show_battery: Signal<CriticalSectionRawMutex, u8>,
     pub update_progress: Signal<CriticalSectionRawMutex, u8>,
+    pub sign_unsign_progress: Signal<CriticalSectionRawMutex, bool>,
 
     pub nvs: Nvs,
     pub aes: Mutex<NoopRawMutex, Aes<'static>>,
@@ -148,6 +149,7 @@ impl GlobalStateInner {
             timer_signal: Signal::new(),
             show_battery: Signal::new(),
             update_progress: Signal::new(),
+            sign_unsign_progress: Signal::new(),
 
             nvs: nvs.clone(),
             aes: Mutex::new(Aes::new(aes)),