From e11a1e208d081261b8d1f2e28bd28e113b8969f4 Mon Sep 17 00:00:00 2001
From: Nate Gay <email@nategay.me>
Date: Mon, 1 Sep 2025 19:04:48 -0500
Subject: [PATCH] Update

---
 src/flight-software/boot.py | 40 +++----------------------------------
 src/flight-software/main.py | 10 +++-------
 src/flight-software/repl.py |  9 +++------
 3 files changed, 9 insertions(+), 50 deletions(-)

diff --git a/src/flight-software/boot.py b/src/flight-software/boot.py
index c9f4c42..e94111c 100644
--- a/src/flight-software/boot.py
+++ b/src/flight-software/boot.py
@@ -1,38 +1,4 @@
-import os
-import time
+from lib.pysquared.boot.filesystem import mkdir
 
-import storage
-
-mount_points = [
-    "/sd",
-]
-
-wait_time = 0.02
-
-storage.disable_usb_drive()
-print("Disabling USB drive")
-time.sleep(wait_time)
-
-storage.mount("/", False)
-print("Remounting root filesystem")
-time.sleep(wait_time)
-
-attempts = 0
-while attempts < 5:
-    attempts += 1
-    try:
-        for path in mount_points:
-            try:
-                os.mkdir(path)
-                print(f"Mount point {path} created.")
-            except OSError:
-                print(f"Mount point {path} already exists.")
-    except Exception as e:
-        print(f"Error creating mount point {path}: {e}")
-        time.sleep(wait_time)
-        continue
-
-    break
-
-storage.enable_usb_drive()
-print("Enabling USB drive")
\ No newline at end of file
+# Create the SD card directory so we can mount it later
+mkdir("/sd")
diff --git a/src/flight-software/main.py b/src/flight-software/main.py
index 33fe441..3694db2 100644
--- a/src/flight-software/main.py
+++ b/src/flight-software/main.py
@@ -31,12 +31,12 @@
 from lib.pysquared.hardware.magnetometer.manager.lis2mdl import LIS2MDLManager
 from lib.pysquared.hardware.radio.manager.rfm9x import RFM9xManager
 from lib.pysquared.hardware.radio.packetizer.packet_manager import PacketManager
+from lib.pysquared.hardware.sd_card.manager.sd_card import SDCardManager
 from lib.pysquared.logger import Logger, LogLevel
 from lib.pysquared.nvm.counter import Counter
 from lib.pysquared.rtc.manager.microcontroller import MicrocontrollerManager
 from lib.pysquared.sleep_helper import SleepHelper
 from lib.pysquared.watchdog import Watchdog
-from lib.pysquared.sd_card import SDCardManager
 from version import __version__
 
 boot_time: float = time.time()
@@ -79,12 +79,9 @@
         board.SPI0_MISO,
     )
 
-    sdCard: SDCardManager = SDCardManager(
-        spi0, 
-        board.SPI0_CS1
-    )
+    sdCard: SDCardManager = SDCardManager(spi0, board.SPI0_CS1)
 
-    logger.sd_card = sdCard
+    logger.set_log_dir("/sd")
 
     radio = RFM9xManager(
         logger,
@@ -94,7 +91,6 @@
         initialize_pin(logger, board.RF1_RST, digitalio.Direction.OUTPUT, True),
     )
 
-
     packet_manager = PacketManager(
         logger,
         radio,
diff --git a/src/flight-software/repl.py b/src/flight-software/repl.py
index e542f19..9b9f34b 100644
--- a/src/flight-software/repl.py
+++ b/src/flight-software/repl.py
@@ -24,12 +24,12 @@
 from lib.pysquared.hardware.magnetometer.manager.lis2mdl import LIS2MDLManager
 from lib.pysquared.hardware.radio.manager.rfm9x import RFM9xManager
 from lib.pysquared.hardware.radio.packetizer.packet_manager import PacketManager
+from lib.pysquared.hardware.sd_card.manager.sd_card import SDCardManager
 from lib.pysquared.logger import Logger
 from lib.pysquared.nvm.counter import Counter
 from lib.pysquared.rtc.manager.microcontroller import MicrocontrollerManager
 from lib.pysquared.sleep_helper import SleepHelper
 from lib.pysquared.watchdog import Watchdog
-from lib.pysquared.sd_card import SDCardManager
 from version import __version__
 
 boot_time: float = time.time()
@@ -64,12 +64,9 @@
         board.SPI0_MISO,
     )
 
-    sdCard: SDCardManager = SDCardManager(
-        spi0, 
-        board.SPI0_CS1
-    )
+    sdCard: SDCardManager = SDCardManager(spi0, board.SPI0_CS1)
 
-    logger.sd_card = sdCard
+    logger.set_log_dir("/sd")
 
     radio = RFM9xManager(
         logger,