Merge branch 'main' into file_vali

Author: ineskhou

Makefile

@@ -1,5 +1,5 @@
-PYSQUARED_VERSION ?= v2.0.0-alpha-25w34
-PYSQUARED ?= git+https://github.com/proveskit/pysquared@$(PYSQUARED_VERSION)
+PYSQUARED_VERSION ?= v2.0.0-alpha-25w40a
+PYSQUARED ?= git+https://github.com/proveskit/pysquared@$(PYSQUARED_VERSION)\#subdirectory=circuitpython-workspaces/flight-software
 BOARD_MOUNT_POINT ?= ""
 BOARD_TTY_PORT ?= ""
 VERSION ?= $(shell git tag --points-at HEAD --sort=-creatordate < /dev/null | head -n 1)

src/flight-software/main.py

@@ -140,7 +140,9 @@ def nominal_power_loop():
 
         cdh.listen_for_commands(10)
 
-        sleep_helper.safe_sleep(config.sleep_duration)
+        beacon.send()
+
+        cdh.listen_for_commands(config.sleep_duration)
 
     try:
         logger.info("Entering main loop")

src/flight-software/repl.py

@@ -18,6 +18,9 @@
 from lib.pysquared.hardware.digitalio import initialize_pin
 from lib.pysquared.hardware.imu.manager.lsm6dsox import LSM6DSOXManager
 from lib.pysquared.hardware.light_sensor.manager.veml7700 import VEML7700Manager
+from lib.pysquared.hardware.load_switch.manager.loadswitch_manager import (
+    LoadSwitchManager,
+)
 from lib.pysquared.hardware.magnetometer.manager.lis2mdl import LIS2MDLManager
 from lib.pysquared.hardware.power_monitor.manager.ina219 import INA219Manager
 from lib.pysquared.hardware.radio.manager.rfm9x import RFM9xManager
@@ -34,6 +37,7 @@
 
 rtc = MicrocontrollerManager()
 
+
 logger: Logger = Logger(
     error_counter=Counter(0),
     colorized=False,
@@ -170,27 +174,34 @@ def get_temp(sensor):
 PAYLOAD_PWR_ENABLE.direction = digitalio.Direction.OUTPUT
 
 
+load_switch_0 = LoadSwitchManager(FACE0_ENABLE, True)  # type: ignore , upstream on mcp TODO
+load_switch_1 = LoadSwitchManager(FACE1_ENABLE, True)  # type: ignore , upstream on mcp TODO
+load_switch_2 = LoadSwitchManager(FACE2_ENABLE, True)  # type: ignore , upstream on mcp TODO
+load_switch_3 = LoadSwitchManager(FACE3_ENABLE, True)  # type: ignore , upstream on mcp TODO
+load_switch_4 = LoadSwitchManager(FACE4_ENABLE, True)  # type: ignore , upstream on mcp TODO
+
+
 # Face Control Helper Functions
 def all_faces_off():
     """
     This function turns off all of the faces. Note the load switches are disabled low.
     """
-    FACE0_ENABLE.value = False
-    FACE1_ENABLE.value = False
-    FACE2_ENABLE.value = False
-    FACE3_ENABLE.value = False
-    FACE4_ENABLE.value = False
+    load_switch_0.disable_load()
+    load_switch_1.disable_load()
+    load_switch_2.disable_load()
+    load_switch_3.disable_load()
+    load_switch_4.disable_load()
 
 
 def all_faces_on():
     """
     This function turns on all of the faces. Note the load switches are enabled high.
     """
-    FACE0_ENABLE.value = True
-    FACE1_ENABLE.value = True
-    FACE2_ENABLE.value = True
-    FACE3_ENABLE.value = True
-    FACE4_ENABLE.value = True
+    load_switch_0.enable_load()
+    load_switch_1.enable_load()
+    load_switch_2.enable_load()
+    load_switch_3.enable_load()
+    load_switch_4.enable_load()
 
 
 file_validator = FileValidationManager(logger)

src/ground-station/lib/requirements.txt

@@ -1,4 +1,4 @@
 adafruit-circuitpython-asyncio @ git+https://github.com/adafruit/[email protected]
 adafruit-circuitpython-rfm==1.0.3
 adafruit-circuitpython-ticks==1.1.1
-proveskit-ground-station @ git+https://github.com/proveskit/[email protected]
+pysquared-ground-station @ git+https://github.com/proveskit/pysquared@d1b22be#subdirectory=circuitpython-workspaces/ground-station

src/ground-station/repl.py

@@ -1,7 +1,7 @@
 import board
 import digitalio
 from busio import SPI
-from lib.proveskit_ground_station.proveskit_ground_station import GroundStation
+from lib.ground_station.ground_station import GroundStation
 from lib.pysquared.cdh import CommandDataHandler
 from lib.pysquared.config.config import Config
 from lib.pysquared.hardware.busio import _spi_init