src/background_tasks/nfc.rs

@@ -1,4 +1,9 @@
-use crate::peripherals::Peripherals;
+use crate::navigation::navigation::display_error;
+use crate::{
+    navigation::{navigation::Mutex, outputs::Outputs, state::NavigationState},
+    peripherals::Peripherals,
+};
+use alloc::string::ToString;
 use embedded_hal_bus::i2c::AtomicDevice;
 use esp_hal::{Blocking, i2c::master::I2c, time::Instant};
 
@@ -15,7 +20,9 @@ use crate::{
 )]
 pub async fn nfc_scanner(
     mut nfc_driver: NfcPn532Driver<AtomicDevice<'static, I2c<'static, Blocking>>>,
+    outputs: &'static Mutex<Outputs>,
     peripherals: &'static Peripherals,
+    navigation_state: &'static Mutex<NavigationState>,
 ) {
     loop {
         while CARD_DATA.lock().await.is_none() {
@@ -45,7 +52,14 @@ pub async fn nfc_scanner(
                     {
                         Ok(()) => {}
                         Err(error) => {
-                            log::error!("Error storing card in flash: {:?}", error)
+                            log::error!("Error storing card in flash: {:?}", error);
+                            display_error(
+                                error.to_string(),
+                                navigation_state,
+                                outputs,
+                                peripherals,
+                            )
+                            .await;
                         }
                     }
 

src/bin/main.rs

@@ -20,6 +20,7 @@ use creaturedex::drivers::tertiary_lcd::{
 use creaturedex::navigation::navigation::Mutex;
 use creaturedex::navigation::inputs::Inputs;
 use creaturedex::navigation::navigation::{self};
+use creaturedex::navigation::state::NavigationState;
 use creaturedex::navigation::outputs::Outputs;
 use creaturedex::peripherals::Peripherals;
 use creaturedex::peripherals::storage::cardstore::CardStore;
@@ -163,7 +164,7 @@ async fn main(spawner: Spawner) {
     display_shit(&mut secondaries[2], "baz 1");
     display_shit_prim(&mut primary, "Hello World");
 
-    let outputs = {
+    let outputs = Box::leak(Box::new(Mutex::new({
         let [sec_1, sec_2, sec_3] = secondaries;
         Outputs {
             primary_display: primary,
@@ -173,12 +174,14 @@ async fn main(spawner: Spawner) {
             tertiary_display: lcd,
             _led_a: (),
         }
-    };
+    })));
+
+    let navigation_state = Box::leak(Box::new(Mutex::new(NavigationState::new())));
 
     log::info!("Setup complete, entering main loop");
-    spawner.spawn(navigation::run(inputs, outputs, peripherals).expect("run task failed"));
+    spawner.spawn(navigation::run(inputs, outputs, peripherals, navigation_state).expect("run task failed"));
     spawner.spawn(
-        background_tasks::nfc_scanner(nfc_driver, peripherals).expect("nfc scanner task failed"),
+        background_tasks::nfc_scanner(nfc_driver, outputs, peripherals, navigation_state).expect("nfc scanner task failed"),
     );
     core::future::pending::<()>().await
 }

src/navigation/navigation.rs

@@ -41,43 +41,56 @@ pub trait Navigable {
     fn handle_input(&self, input: Action) -> impl core::future::Future<Output = NewState> + Send;
 }
 
-#[embassy_executor::task]
+pub async fn display_error(
-pub async fn run(mut inputs: Inputs, mut outputs: Outputs, peripherals: &'static Peripherals) {
+    error: String,
-    async fn display_error(
+    navigation_state: &Mutex<NavigationState>,
-        error: String,
+    outputs: &Mutex<Outputs>,
-        state: &mut NavigationState,
+    peripherals: &Peripherals,
-        outputs: &mut Outputs,
+) -> () {
-        peripherals: &Peripherals,
+    let error_view = ErrorView {
-    ) -> () {
+        error: error.to_string(),
-        let error_view = ErrorView {
+    };
-            error: error.to_string(),
+    let mut state = navigation_state.lock().await;
-        };
+    state.screens.push(View::Error(error_view));
-        state.screens.push(View::Error(error_view));
+    let mut outs = outputs.lock().await;
-        state
+    state
-            .screens
-            .last()
-            // Unwrap: we just pushed the state
-            .unwrap()
-            .display(outputs, peripherals)
-            .await
-            // Unwrap: display will panic on error in error view
-            .unwrap();
-    }
-
-    log::info!("starting navigation");
-
-    let mut state = NavigationState::new();
-    if let Err(error) = state
         .screens
         .last()
+        // Unwrap: we just pushed the state
         .unwrap()
-        .display(&mut outputs, peripherals)
+        .display(&mut outs, peripherals)
         .await
+        // Unwrap: display will panic on error in error view
+        .unwrap();
+}
+
+#[embassy_executor::task]
+pub async fn run(
+    mut inputs: Inputs,
+    mut outputs: &'static Mutex<Outputs>,
+    peripherals: &'static Peripherals,
+    navigation_state: &'static Mutex<NavigationState>,
+) {
+    log::info!("starting navigation");
+
     {
-        display_error(error.to_string(), &mut state, &mut outputs, peripherals).await;
+        let mut outs = outputs.lock().await;
-    };
+        if let Err(error) = navigation_state
+            .lock()
+            .await
+            .screens
+            .last()
+            .unwrap()
+            .display(&mut outs, peripherals)
+            .await
+        {
+            display_error(error.to_string(), &navigation_state, &outputs, peripherals).await;
+        };
+    }
 
     loop {
+        Timer::after(Duration::from_millis(DEBOUNCE_DURATION_MILLIS)).await;
+        let mut state = navigation_state.lock().await;
         let selection = select(
             inputs.wait_for_press(),
             Timer::after(Duration::from_millis(DEBOUNCE_DURATION_MILLIS)),
@@ -120,17 +133,22 @@ pub async fn run(mut inputs: Inputs, mut outputs: Outputs, peripherals: &'static
         }
         state.screens.push(new_state.view);
 
+        let mut outs = outputs.lock().await;
         if (action != Action::Timer || new_state.redraw)
             && let Err(error) = state
                 .screens
                 .last()
                 .unwrap()
-                .display(&mut outputs, peripherals)
+                .display(&mut outs, peripherals)
                 .await
         {
-            display_error(error.to_string(), &mut state, &mut outputs, peripherals).await;
+            display_error(
+                error.to_string(),
+                &navigation_state,
+                &mut outputs,
+                peripherals,
+            )
+            .await;
         }
-
-        Timer::after(Duration::from_millis(DEBOUNCE_DURATION_MILLIS)).await;
     }
 }

src/peripherals/storage/flash_store.rs

@@ -21,8 +21,9 @@ impl Error for FlashStoreError {}
 
 impl Display for FlashStoreError {
     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        use core::fmt::Debug;
+        match self {
-        self.0.fmt(f)
+            err => write!(f, "FlashStoreError:\n{:?}", err.0),
+        }
     }
 }
 

src/views/error_view.rs

@@ -64,7 +64,7 @@ impl Navigable for ErrorView {
                 .alignment(HorizontalAlignment::Center)
                 .build();
 
-            let bounds = Rectangle::new(Point::new(0, 30), display_area.size);
+            let bounds = Rectangle::new(Point::new(0, 50), display_area.size);
 
             TextBox::with_textbox_style(&self.error.to_string(), bounds, style, textbox_style)
                 .draw(&mut outputs.primary_display)