Initial V5a Working Reference

Makefile

@@ -1,4 +1,4 @@
-PYSQUARED_VERSION ?= v2.0.0-alpha-25w14-3
+PYSQUARED_VERSION ?= v2.0.0-alpha-25w17
 PYSQUARED ?= git+https://github.com/proveskit/pysquared@$(PYSQUARED_VERSION)
 
 .PHONY: all

lib/requirements.txt

@@ -1,4 +1,4 @@
-adafruit-circuitpython-74hc595==1.4.6
+adafruit-circuitpython-ina219==3.4.26
 adafruit-circuitpython-asyncio @ git+https://github.com/adafruit/[email protected]
 adafruit-circuitpython-drv2605==1.3.4
 adafruit-circuitpython-lis2mdl==2.1.23
@@ -7,8 +7,9 @@ adafruit-circuitpython-mcp9808==3.3.24
 adafruit-circuitpython-neopixel==6.3.12
 adafruit-circuitpython-register==1.10.1
 adafruit-circuitpython-rfm==1.0.3
-adafruit-circuitpython-tca9548a @ git+https://github.com/proveskit/Adafruit_CircuitPython_TCA9548A@1.0.0
+adafruit-circuitpython-tca9548a @ git+https://github.com/proveskit/Adafruit_CircuitPython_TCA9548A@1.1.0
 adafruit-circuitpython-ticks==1.1.1
 adafruit-circuitpython-veml7700==2.0.2
+Adafruit_CircuitPython_MCP230xx
 proves-circuitpython-rv3028 @ git+https://github.com/proveskit/[email protected]
-proves-circuitpython-sx126 @ git+https://github.com/proveskit/[email protected]
+proves-circuitpython-sx1280 @ git+https://github.com/proveskit/CircuitPython_SX1280@mike-dev

main.py

@@ -3,34 +3,29 @@
 # Created By: Michael Pham
 
 """
-Built for the PySquared FC Board
-Version: 2.0.0
-Published: Nov 19, 2024
+Built for the PySquared V5a FC Board
+Version: X.X.X
+Published:
 """
 
 import gc
+import os
 import time
 
+import board
 import digitalio
 import microcontroller
 
-try:
-    # from board_definitions import proveskit_rp2040_v4 as board
-    raise ImportError
-except ImportError:
-    import board
-
-import os
-
 import lib.pysquared.functions as functions
 import lib.pysquared.nvm.register as register
+from lib.proves_sx1280.sx1280 import SX1280
 from lib.pysquared.cdh import CommandDataHandler
 from lib.pysquared.config.config import Config
 from lib.pysquared.hardware.busio import _spi_init, initialize_i2c_bus
 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.radio.manager.sx126x import SX126xManager
+from lib.pysquared.hardware.radio.manager.rfm9x import RFM9xManager
 from lib.pysquared.logger import Logger
 from lib.pysquared.nvm.counter import Counter
 from lib.pysquared.nvm.flag import Flag
@@ -43,7 +38,7 @@
 rtc = MicrocontrollerManager()
 
 logger: Logger = Logger(
-    error_counter=Counter(index=register.ERRORCNT, datastore=microcontroller.nvm),
+    error_counter=Counter(index=register.ERRORCNT),
     colorized=False,
 )
 
@@ -68,38 +63,62 @@
 
     # TODO(nateinaction): fix spi init
     spi0 = _spi_init(
+        logger,
+        board.SPI0_SCK,
+        board.SPI0_MOSI,
+        board.SPI0_MISO,
+    )
+
+    spi1 = _spi_init(
         logger,
         board.SPI1_SCK,
         board.SPI1_MOSI,
         board.SPI1_MISO,
     )
 
-    radio = SX126xManager(
-        logger,
-        config.radio,
-        Flag(index=register.FLAG, bit_index=7, datastore=microcontroller.nvm),
-        spi0,
-        initialize_pin(logger, board.SPI0_CS0, digitalio.Direction.OUTPUT, True),
-        board.RF2_IO0,
-        initialize_pin(logger, board.RF1_RST, digitalio.Direction.OUTPUT, True),
-        board.RF2_IO4,
+    ### This is Hacky V5a Devel Stuff###
+    spi1_cs0 = digitalio.DigitalInOut(board.SPI1_CS0)
+    rf2_rst = digitalio.DigitalInOut(board.RF2_RST)
+    rf2_busy = digitalio.DigitalInOut(board.RF2_IO0)
+
+    tx_en = digitalio.DigitalInOut(board.RF2_TX_EN)
+    rx_en = digitalio.DigitalInOut(board.RF2_RX_EN)
+    tx_en.direction = digitalio.Direction.OUTPUT
+    rx_en.direction = digitalio.Direction.OUTPUT
+
+    radio2 = SX1280(
+        spi1, spi1_cs0, rf2_rst, rf2_busy, 2.4, debug=False, txen=tx_en, rxen=rx_en
     )
 
+    radio2.send("Hello World")
+    print("Radio2 sent Hello World")
+
+    ### This is Hacky V5a Devel Stuff###
+
     i2c1 = initialize_i2c_bus(
         logger,
-        board.I2C1_SCL,
-        board.I2C1_SDA,
+        board.SCL1,
+        board.SDA1,
         100000,
     )
 
-    magnetometer = LIS2MDLManager(logger, i2c1)
-
-    imu = LSM6DSOXManager(logger, i2c1, 0x6B)
-
     c = Satellite(logger, config)
 
     sleep_helper = SleepHelper(c, logger, watchdog)
 
+    radio = RFM9xManager(
+        logger,
+        config.radio,
+        Flag(index=register.FLAG, bit_index=7),
+        spi0,
+        initialize_pin(logger, board.SPI0_CS0, digitalio.Direction.OUTPUT, True),
+        initialize_pin(logger, board.RF1_RST, digitalio.Direction.OUTPUT, True),
+    )
+
+    magnetometer = LIS2MDLManager(logger, i2c1)
+
+    imu = LSM6DSOXManager(logger, i2c1, 0x6B)
+
     cdh = CommandDataHandler(config, logger, radio)
 
     f = functions.functions(
@@ -150,15 +169,16 @@ def send_imu_data():
     def main():
         f.beacon()
 
+        print("Testing Radio2")
+        print(radio2.receive())
+
         f.listen_loiter()
 
         f.state_of_health()
 
         f.listen_loiter()
 
-        f.all_face_data()
         watchdog.pet()
-        f.send_face()
 
         f.listen_loiter()
 

pyproject.toml

@@ -1,51 +1,31 @@
 [project]
-name = "circuitpy-flight-software"
-version = "2.0.0"
-description = "Flight Software for the PROVES Kit"
+name = "proveskit-rp2350-v5a"
+version = "1.0.0"
+description = "Flight Software for the PROVES Kit RP2350 v5A"
 readme = "README.md"
 requires-python = ">=3.13"
 dependencies = [
     "adafruit-circuitpython-typing==1.11.2",
     "circuitpython-stubs==9.2.5",
     "coverage==7.6.10",
     "pre-commit==4.0.1",
+    "pyright[nodejs]==1.1.399",
     "pytest==8.3.2",
 ]
 
 [tool.ruff.format]
 # Use `\n` line endings for all files
 line-ending = "lf"
 
-[tool.pytest.ini_options]
-pythonpath = "."
-markers = [
-    "slow: marks tests as slow (deselect with '-m \"not slow\"')",
+[tool.pyright]
+include = ["main.py", "boot.py", "repl.py", "safemode.py"]
+exclude = [
+    "**/__pycache__",
+    ".venv",
+    ".git",
+    "artifacts",
+    "lib",
+    "typings",
 ]
-
-[tool.coverage.run]
-branch = true
-relative_files = true
-
-[tool.coverage.report]
-show_missing = true
-skip_covered = false
-include = [
-    "lib/**/*.py",
-    "boot.py",
-    "main.py",
-    "repl.py",
-    "safemode.py",
-    ]
-omit = [
-    "lib/adafruit_*/**",
-    "lib/asyncio_*/**",
-    "lib/rv3028*/**",
-    "lib/neopixel.py",
-    "lib/pysquared/**"
-    ]
-
-[tool.coverage.html]
-directory = ".coverage-reports/html"
-
-[tool.coverage.xml]
-output = ".coverage-reports/coverage.xml"
+stubPath = "./typings"
+reportMissingModuleSource = false