works for both c and d firmware

Author: ineskhou

src/flight-software/main.py

@@ -5,6 +5,8 @@
 import board
 import digitalio
 import microcontroller
+from lib.adafruit_mcp230xx.mcp23017 import MCP23017
+from lib.adafruit_tca9548a import TCA9548A
 from lib.proveskit_rp2350_v5b.register import Register
 from lib.pysquared.beacon import Beacon
 from lib.pysquared.cdh import CommandDataHandler
@@ -13,20 +15,14 @@
 from lib.pysquared.hardware.digitalio import initialize_pin
 from lib.pysquared.hardware.imu.manager.lsm6dsox import LSM6DSOXManager
 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
 from lib.pysquared.hardware.radio.manager.sx1280 import SX1280Manager
 from lib.pysquared.hardware.radio.packetizer.packet_manager import PacketManager
 from lib.pysquared.logger import Logger
 from lib.pysquared.nvm.counter import Counter
+from lib.pysquared.protos.power_monitor import PowerMonitorProto
 from lib.pysquared.rtc.manager.microcontroller import MicrocontrollerManager
-from lib.pysquared.watchdog import Watchdog
-from lib.adafruit_mcp230xx.mcp23017 import MCP23017
-from lib.pysquared.hardware.power_monitor.manager.ina219 import INA219Manager
-
-
-from lib.adafruit_tca9548a import TCA9548A  
-
-
 from version import __version__
 
 boot_time: float = time.time()
@@ -56,16 +52,17 @@
     time.sleep(1)
 
 try:
-
     SPI0_CS0 = initialize_pin(logger, board.SPI0_CS0, digitalio.Direction.OUTPUT, True)
     SPI1_CS0 = initialize_pin(logger, board.SPI1_CS0, digitalio.Direction.OUTPUT, True)
-    GPIO_RESET = initialize_pin(logger, board.GPIO_EXPANDER_RESET, digitalio.Direction.OUTPUT, True)
+    GPIO_RESET = initialize_pin(
+        logger, board.GPIO_EXPANDER_RESET, digitalio.Direction.OUTPUT, True
+    )
 
     i2c1 = initialize_i2c_bus(
-    logger,
-    board.I2C1_SCL,
-    board.I2C1_SDA,
-    100000,
+        logger,
+        board.I2C1_SCL,
+        board.I2C1_SDA,
+        100000,
     )
 
     i2c0 = initialize_i2c_bus(
@@ -75,10 +72,9 @@
         100000,
     )
 
+    mcp = MCP23017(i2c1)
 
-    mcp = MCP23017(i2c1) 
-
-    #GPB
+    # GPB
     FACE4_ENABLE = mcp.get_pin(8)
     FACE0_ENABLE = mcp.get_pin(9)
     FACE1_ENABLE = mcp.get_pin(10)
@@ -110,7 +106,6 @@
         board.SPI1_MISO,
     )
 
-
     sband_radio = SX1280Manager(
         logger,
         config.radio,
@@ -123,13 +118,12 @@
         initialize_pin(logger, board.RF2_RX_EN, digitalio.Direction.OUTPUT, False),
     )
 
-
     uhf_radio = RFM9xManager(
-    logger,
-    config.radio,
-    spi0,
-    SPI0_CS0,
-    initialize_pin(logger, board.RF1_RST, digitalio.Direction.OUTPUT, True),
+        logger,
+        config.radio,
+        spi0,
+        SPI0_CS0,
+        initialize_pin(logger, board.RF1_RST, digitalio.Direction.OUTPUT, True),
     )
 
     magnetometer = LIS2MDLManager(logger, i2c1)
@@ -157,7 +151,6 @@
         sband_radio,
     )
 
-
     # Face Control Helper Functions
     def all_faces_off():
         """
@@ -169,7 +162,6 @@ def all_faces_off():
         FACE3_ENABLE.value = False
         FACE4_ENABLE.value = False
 
-
     def all_faces_on():
         """
         This function turns on all of the faces. Note the load switches are enabled high.
@@ -180,16 +172,17 @@ def all_faces_on():
         FACE3_ENABLE.value = True
         FACE4_ENABLE.value = True
 
-    mux_reset = initialize_pin(logger, board.MUX_RESET, digitalio.Direction.OUTPUT, False)
+    mux_reset = initialize_pin(
+        logger, board.MUX_RESET, digitalio.Direction.OUTPUT, False
+    )
     all_faces_on()
     time.sleep(0.1)
     mux_reset.value = True
-    tca = TCA9548A(i2c0, address=int(0x77)) #all 3 connected to high
+    tca = TCA9548A(i2c0, address=int(0x77))  # all 3 connected to high
 
     battery_power_monitor: PowerMonitorProto = INA219Manager(logger, i2c0, 0x40)
     solar_power_monitor: PowerMonitorProto = INA219Manager(logger, i2c0, 0x41)
 
-
     def nominal_power_loop():
         logger.debug(
             "FC Board Stats",
@@ -204,8 +197,6 @@ def nominal_power_loop():
 
         cdh.listen_for_commands(10)
 
-        sleep_helper.safe_sleep(config.sleep_duration)
-
     try:
         logger.info("Entering main loop")
         while True:

src/flight-software/repl.py

@@ -4,8 +4,7 @@
 import board
 import digitalio
 from lib.adafruit_mcp230xx.mcp23017 import MCP23017
-from lib.adafruit_tca9548a import TCA9548A  
-
+from lib.adafruit_tca9548a import TCA9548A
 from lib.pysquared.beacon import Beacon
 from lib.pysquared.cdh import CommandDataHandler
 from lib.pysquared.config.config import Config
@@ -24,7 +23,8 @@
 from lib.pysquared.nvm.counter import Counter
 from lib.pysquared.protos.power_monitor import PowerMonitorProto
 from lib.pysquared.rtc.manager.microcontroller import MicrocontrollerManager
-#from lib.pysquared.sleep_helper import SleepHelper
+
+# from lib.pysquared.sleep_helper import SleepHelper
 from lib.pysquared.watchdog import Watchdog
 from version import __version__
 
@@ -47,33 +47,37 @@
 logger.debug("Initializing Config")
 config: Config = Config("config.json")
 
+
 def get_temp(sensor):
     for i in range(1000):
         print(sensor.get_temperature().value)
         time.sleep(0.1)
 
+
 SPI0_CS0 = initialize_pin(logger, board.SPI0_CS0, digitalio.Direction.OUTPUT, True)
 SPI1_CS0 = initialize_pin(logger, board.SPI1_CS0, digitalio.Direction.OUTPUT, True)
 
-#manually set the pin high to allow mcp to be detected
-GPIO_RESET = initialize_pin(logger, board.GPIO_EXPANDER_RESET, digitalio.Direction.OUTPUT, True),
+# manually set the pin high to allow mcp to be detected
+GPIO_RESET = (
+    initialize_pin(logger, board.GPIO_EXPANDER_RESET, digitalio.Direction.OUTPUT, True),
+)
 
 i2c1 = initialize_i2c_bus(
     logger,
-    board.I2C1_SCL,
-    board.I2C1_SDA,
+    board.SCL1,
+    board.SDA1,
     100000,
 )
 
 i2c0 = initialize_i2c_bus(
     logger,
-    board.I2C0_SCL,
-    board.I2C0_SDA,
+    board.SCL0,
+    board.SDA0,
     100000,
 )
 
 
-mcp = MCP23017(i2c1) 
+mcp = MCP23017(i2c1)
 
 
 # #GPB
@@ -83,9 +87,9 @@ def get_temp(sensor):
 FACE2_ENABLE = mcp.get_pin(11)
 FACE3_ENABLE = mcp.get_pin(12)
 FACE5_ENABLE = mcp.get_pin(13)
-#READ ONLY
-#CHARGE
-    
+# READ ONLY
+# CHARGE
+
 # GPA
 ENABLE_HEATER = mcp.get_pin(0)
 PAYLOAD_PWR_ENABLE = mcp.get_pin(1)
@@ -106,7 +110,6 @@ def get_temp(sensor):
 PAYLOAD_PWR_ENABLE.direction = digitalio.Direction.OUTPUT
 
 
-
 # # TODO(nateinaction): fix spi init
 spi0 = _spi_init(
     logger,
@@ -135,7 +138,7 @@ def get_temp(sensor):
 )
 
 
-#sleep_helper = SleepHelper(logger, config, watchdog)
+# sleep_helper = SleepHelper(logger, config, watchdog)
 
 uhf_radio = RFM9xManager(
     logger,
@@ -171,7 +174,6 @@ def get_temp(sensor):
 )
 
 
-
 # Face Control Helper Functions
 def all_faces_off():
     """
@@ -203,7 +205,7 @@ def all_faces_on():
 all_faces_on()
 time.sleep(0.1)
 mux_reset.value = True
-tca = TCA9548A(i2c0, address=int(0x77)) #all 3 connected to high
+tca = TCA9548A(i2c0, address=int(0x77))  # all 3 connected to high
 
 
 # # Light Sensors
@@ -289,7 +291,7 @@ def all_faces_on():
 except Exception:
     logger.debug("WARNING!!! Temp sensor 4 failed (Z- Face Bottom pins")
     temp_sensors.append(None)
-#these are the bottom 6 pins on the z- face connection, uncomment if that is where you plug in a face for the z- board
+# these are the bottom 6 pins on the z- face connection, uncomment if that is where you plug in a face for the z- board
 # try:
 #     sensor = MCP9808Manager(logger, tca[6], addr=24)
 #     temp_sensors.append(sensor)