Skip to content

Commit e11a1e2

Browse files
committed
Update
1 parent 83708bd commit e11a1e2

File tree

3 files changed

+9
-50
lines changed

3 files changed

+9
-50
lines changed

src/flight-software/boot.py

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,4 @@
1-
import os
2-
import time
1+
from lib.pysquared.boot.filesystem import mkdir
32

4-
import storage
5-
6-
mount_points = [
7-
"/sd",
8-
]
9-
10-
wait_time = 0.02
11-
12-
storage.disable_usb_drive()
13-
print("Disabling USB drive")
14-
time.sleep(wait_time)
15-
16-
storage.mount("/", False)
17-
print("Remounting root filesystem")
18-
time.sleep(wait_time)
19-
20-
attempts = 0
21-
while attempts < 5:
22-
attempts += 1
23-
try:
24-
for path in mount_points:
25-
try:
26-
os.mkdir(path)
27-
print(f"Mount point {path} created.")
28-
except OSError:
29-
print(f"Mount point {path} already exists.")
30-
except Exception as e:
31-
print(f"Error creating mount point {path}: {e}")
32-
time.sleep(wait_time)
33-
continue
34-
35-
break
36-
37-
storage.enable_usb_drive()
38-
print("Enabling USB drive")
3+
# Create the SD card directory so we can mount it later
4+
mkdir("/sd")

src/flight-software/main.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
from lib.pysquared.hardware.magnetometer.manager.lis2mdl import LIS2MDLManager
3232
from lib.pysquared.hardware.radio.manager.rfm9x import RFM9xManager
3333
from lib.pysquared.hardware.radio.packetizer.packet_manager import PacketManager
34+
from lib.pysquared.hardware.sd_card.manager.sd_card import SDCardManager
3435
from lib.pysquared.logger import Logger, LogLevel
3536
from lib.pysquared.nvm.counter import Counter
3637
from lib.pysquared.rtc.manager.microcontroller import MicrocontrollerManager
3738
from lib.pysquared.sleep_helper import SleepHelper
3839
from lib.pysquared.watchdog import Watchdog
39-
from lib.pysquared.sd_card import SDCardManager
4040
from version import __version__
4141

4242
boot_time: float = time.time()
@@ -79,12 +79,9 @@
7979
board.SPI0_MISO,
8080
)
8181

82-
sdCard: SDCardManager = SDCardManager(
83-
spi0,
84-
board.SPI0_CS1
85-
)
82+
sdCard: SDCardManager = SDCardManager(spi0, board.SPI0_CS1)
8683

87-
logger.sd_card = sdCard
84+
logger.set_log_dir("/sd")
8885

8986
radio = RFM9xManager(
9087
logger,
@@ -94,7 +91,6 @@
9491
initialize_pin(logger, board.RF1_RST, digitalio.Direction.OUTPUT, True),
9592
)
9693

97-
9894
packet_manager = PacketManager(
9995
logger,
10096
radio,

src/flight-software/repl.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
from lib.pysquared.hardware.magnetometer.manager.lis2mdl import LIS2MDLManager
2525
from lib.pysquared.hardware.radio.manager.rfm9x import RFM9xManager
2626
from lib.pysquared.hardware.radio.packetizer.packet_manager import PacketManager
27+
from lib.pysquared.hardware.sd_card.manager.sd_card import SDCardManager
2728
from lib.pysquared.logger import Logger
2829
from lib.pysquared.nvm.counter import Counter
2930
from lib.pysquared.rtc.manager.microcontroller import MicrocontrollerManager
3031
from lib.pysquared.sleep_helper import SleepHelper
3132
from lib.pysquared.watchdog import Watchdog
32-
from lib.pysquared.sd_card import SDCardManager
3333
from version import __version__
3434

3535
boot_time: float = time.time()
@@ -64,12 +64,9 @@
6464
board.SPI0_MISO,
6565
)
6666

67-
sdCard: SDCardManager = SDCardManager(
68-
spi0,
69-
board.SPI0_CS1
70-
)
67+
sdCard: SDCardManager = SDCardManager(spi0, board.SPI0_CS1)
7168

72-
logger.sd_card = sdCard
69+
logger.set_log_dir("/sd")
7370

7471
radio = RFM9xManager(
7572
logger,

0 commit comments

Comments
 (0)