feat: Roll back the boot process when mfrc522 is not available

Author: L-jasmine

Cargo.toml

@@ -28,7 +28,8 @@ box = ["_no_default"]
 cube = ["_no_default"]
 cube2 = ["_no_default"]
 
-mfrc522 = ["ndef"]
+mfrc522 = ["ndef", "extra_server"]
+extra_server = []
 
 [dependencies]
 log = "0.4"

src/app.rs

@@ -16,10 +16,11 @@ pub enum Event {
     MicAudioEnd,
     MicInterrupt(Vec<i16>),
     MicInterruptWaitTimeout,
+    #[cfg_attr(not(feature = "extra_server"), allow(unused))]
     ServerUrl(String),
 }
 
-#[allow(dead_code)]
+#[allow(unused)]
 impl Event {
     pub const IDLE: &'static str = "idle";
     pub const GAIA: &'static str = "gaia";

src/audio.rs

@@ -90,6 +90,7 @@ impl AFE {
         }
     }
 
+    #[allow(unused)]
     fn feed(&self, data: &[u8]) -> i32 {
         let afe_handle = self.handle;
         let afe_data = self.data;

src/boards/base.rs

@@ -204,15 +204,6 @@ macro_rules! start_hal {
                 $evt_tx.clone(),
             );
         }
-        #[cfg(not(feature = "mfrc522"))]
-        {
-            log::info!("MFRC522 feature not enabled, skipping RFID initialization");
-            $evt_tx
-                .blocking_send(crate::app::Event::ServerUrl(String::new()))
-                .unwrap_or_else(|e| {
-                    log::error!("Failed to send ServerUrl event: {:?}", e);
-                });
-        }
     }};
 }
 

src/boards/cube2.rs

@@ -200,16 +200,6 @@ macro_rules! start_hal {
         {
             todo!("MFRC522 initialization not implemented yet");
         }
-
-        #[cfg(not(feature = "mfrc522"))]
-        {
-            log::info!("MFRC522 feature not enabled, skipping RFID initialization");
-            $evt_tx
-                .blocking_send(crate::app::Event::ServerUrl(String::new()))
-                .unwrap_or_else(|e| {
-                    log::error!("Failed to send ServerUrl event: {:?}", e);
-                });
-        }
     }
     let _backlight = {
         let mut backlight = crate::boards::backlight_init($peripherals.pins.gpio13.into()).unwrap();

src/main.rs

@@ -98,24 +98,27 @@ fn main() -> anyhow::Result<()> {
 
     log_heap();
 
-    gui.state = "Initializing...".to_string();
-    gui.text = "Wait Loading Server URL...".to_string();
-    gui.display_flush().unwrap();
+    #[cfg(feature = "extra_server")]
+    {
+        gui.state = "Initializing...".to_string();
+        gui.text = "Loading Server URL...".to_string();
+        gui.display_flush().unwrap();
 
-    while let Some(event) = evt_rx.blocking_recv() {
-        if let app::Event::ServerUrl(url) = event {
-            log::info!("Received ServerUrl event: {}", url);
-            if !url.is_empty() {
-                server_url = url;
+        while let Some(event) = evt_rx.blocking_recv() {
+            if let app::Event::ServerUrl(url) = event {
+                log::info!("Received ServerUrl event: {}", url);
+                if !url.is_empty() {
+                    server_url = url;
+                }
+                break;
             }
-            break;
         }
-    }
 
-    std::thread::sleep(std::time::Duration::from_millis(500));
-    gui.text = format!("Server URL: {}\nContinuing...", server_url);
-    gui.display_flush().unwrap();
-    std::thread::sleep(std::time::Duration::from_millis(3000));
+        std::thread::sleep(std::time::Duration::from_millis(500));
+        gui.text = format!("Server URL: {}\nContinuing...", server_url);
+        gui.display_flush().unwrap();
+        std::thread::sleep(std::time::Duration::from_millis(2000));
+    }
 
     let need_init = {
         button.is_low() || state == 1 || ssid.is_empty() || pass.is_empty() || server_url.is_empty()

src/ui.rs

@@ -217,6 +217,7 @@ pub struct QrCanvas {
     width: u32,
     height: u32,
     dark_pixel: QrPixel,
+    #[allow(unused)]
     light_pixel: QrPixel,
     pixels: Vec<embedded_graphics::Pixel<ColorFormat>>,
 }

src/ws.rs

@@ -148,6 +148,7 @@ impl Server {
         })
     }
 
+    #[allow(unused)]
     pub fn set_timeout(&mut self, timeout: std::time::Duration) {
         self.timeout = timeout;
     }