Skip to content

Update #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: sdcard_logging
Choose a base branch
from
Open

Update #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 3 additions & 37 deletions src/flight-software/boot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
# Create the SD card directory so we can mount it later
mkdir("/sd")
10 changes: 3 additions & 7 deletions src/flight-software/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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,
Expand All @@ -94,7 +91,6 @@
initialize_pin(logger, board.RF1_RST, digitalio.Direction.OUTPUT, True),
)


packet_manager = PacketManager(
logger,
radio,
Expand Down
9 changes: 3 additions & 6 deletions src/flight-software/repl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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,
Expand Down
Loading