From cc3605b75d32d16ad4d24bd71a715e81351c8f49 Mon Sep 17 00:00:00 2001
From: Djeeberjr <djeeberjr@gmail.com>
Date: Wed, 1 Oct 2025 17:54:54 +0200
Subject: [PATCH] return sdcard from hardware init

---
 src/init/hardware.rs | 8 +++++---
 src/main.rs          | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/init/hardware.rs b/src/init/hardware.rs
index c5effe6..b0b9b11 100644
--- a/src/init/hardware.rs
+++ b/src/init/hardware.rs
@@ -34,7 +34,7 @@ use log::{debug, error, info};
 
 use crate::FEEDBACK_STATE;
 use crate::init::network;
-use crate::init::sd_card::setup_sdcard;
+use crate::init::sd_card::{setup_sdcard, SDCardPersistence};
 use crate::init::wifi;
 use crate::store::AttendanceDay;
 use crate::store::persistence::Persistence;
@@ -79,6 +79,7 @@ pub async fn hardware_init(
     SmartLedsAdapterAsync<ConstChannelAccess<esp_hal::rmt::Tx, 0>, LED_BUFFER_SIZE>,
     GPIO21<'static>,
     GPIO0<'static>,
+    SDCardPersistence,
 ) {
     let config = esp_hal::Config::default().with_cpu_clock(CpuClock::max());
     let peripherals = esp_hal::init(config);
@@ -104,7 +105,7 @@ pub async fn hardware_init(
 
     let i2c_device = setup_i2c(peripherals.I2C0, peripherals.GPIO22, peripherals.GPIO23);
 
-    let mut sd_det_gpio = peripherals.GPIO0;
+    let sd_det_gpio = peripherals.GPIO0;
 
     let spi_bus = setup_spi(
         peripherals.SPI2,
@@ -119,7 +120,7 @@ pub async fn hardware_init(
         OutputConfig::default(),
     );
 
-    let mut vol_mgr = setup_sdcard(spi_bus, sd_cs_pin);
+    let vol_mgr = setup_sdcard(spi_bus, sd_cs_pin);
 
     let buzzer_gpio = peripherals.GPIO21;
 
@@ -136,6 +137,7 @@ pub async fn hardware_init(
         led,
         buzzer_gpio,
         sd_det_gpio,
+        vol_mgr,
     )
 }
 
diff --git a/src/main.rs b/src/main.rs
index b0b7e78..f58d45e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -37,7 +37,7 @@ type TallyPublisher = Publisher<'static, NoopRawMutex, TallyID, 8, 2, 1>;
 
 #[esp_hal_embassy::main]
 async fn main(mut spawner: Spawner) {
-    let (uart_device, stack, _i2c, _led, buzzer_gpio, sd_det_gpio) =
+    let (uart_device, stack, _i2c, _led, buzzer_gpio, sd_det_gpio, persistence_layer) =
         init::hardware::hardware_init(&mut spawner).await;
 
     wait_for_stack_up(stack).await;