abliltu to change counter and stuff

Author: ineskhou

Makefile

@@ -1,4 +1,4 @@
-PYSQUARED_VERSION ?= v2.0.0-alpha-25w40a
+PYSQUARED_VERSION ?= copilot/fix-7bfb9c49-466e-42db-a6be-dece956d6d8c
 PYSQUARED ?= git+https://github.com/proveskit/pysquared@$(PYSQUARED_VERSION)\#subdirectory=circuitpython-workspaces/flight-software
 PYSQUARED_GS ?= git+https://github.com/proveskit/pysquared@$(PYSQUARED_VERSION)\#subdirectory=circuitpython-workspaces/ground-station
 BOARD_MOUNT_POINT ?= ""

config.json

@@ -22,7 +22,7 @@
       "modulation_type": 0,
       "node_address": 1
     },
-    "license": "",
+    "license": "HHH",
     "lora": {
       "ack_delay": 0.2,
       "coding_rate": 8,

src/flight-software/main.py

@@ -9,6 +9,7 @@
 from lib.pysquared.beacon import Beacon
 from lib.pysquared.cdh import CommandDataHandler
 from lib.pysquared.config.config import Config
+from lib.pysquared.config.jokes_config import JokesConfig
 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
@@ -52,6 +53,7 @@
 
     logger.debug("Initializing Config")
     config: Config = Config("config.json")
+    jokes_config: JokesConfig = JokesConfig("jokes.json")
 
     mux_reset = initialize_pin(
         logger, board.MUX_RESET, digitalio.Direction.OUTPUT, False
@@ -113,7 +115,7 @@
         0.2,
     )
 
-    cdh = CommandDataHandler(logger, config, uhf_packet_manager)
+    cdh = CommandDataHandler(logger, config, uhf_packet_manager, jokes_config)
 
     beacon = Beacon(
         logger,

src/flight-software/repl.py

@@ -12,6 +12,7 @@
 from lib.pysquared.beacon import Beacon
 from lib.pysquared.cdh import CommandDataHandler
 from lib.pysquared.config.config import Config
+from lib.pysquared.config.jokes_config import JokesConfig
 from lib.pysquared.file_validation.manager.file_validation import FileValidationManager
 from lib.pysquared.hardware.burnwire.manager.burnwire import BurnwireManager
 from lib.pysquared.hardware.busio import _spi_init, initialize_i2c_bus
@@ -61,6 +62,8 @@ def get_temp(sensor):
 
 logger.debug("Initializing Config")
 config: Config = Config("config.json")
+jokes_config: JokesConfig = JokesConfig("jokes.json")
+
 
 mux_reset = initialize_pin(logger, board.MUX_RESET, digitalio.Direction.OUTPUT, False)
 
@@ -127,7 +130,7 @@ def get_temp(sensor):
     0.2,
 )
 
-cdh = CommandDataHandler(logger, config, uhf_packet_manager)
+cdh = CommandDataHandler(logger, config, uhf_packet_manager, jokes_config)
 
 beacon = Beacon(
     logger,

src/ground-station/repl.py

@@ -4,6 +4,7 @@
 from lib.ground_station.ground_station import GroundStation
 from lib.pysquared.cdh import CommandDataHandler
 from lib.pysquared.config.config import Config
+from lib.pysquared.config.jokes_config import JokesConfig
 from lib.pysquared.hardware.busio import _spi_init
 from lib.pysquared.hardware.digitalio import initialize_pin
 from lib.pysquared.hardware.radio.manager.rfm9x import RFM9xManager
@@ -16,6 +17,7 @@
     colorized=False,
 )
 config: Config = Config("config.json")
+jokes_config: JokesConfig = JokesConfig("jokes.json")
 
 spi0: SPI = _spi_init(
     logger,
@@ -40,11 +42,7 @@
     0.2,
 )
 
-cdh = CommandDataHandler(
-    logger,
-    config,
-    packet_manager,
-)
+cdh = CommandDataHandler(logger, config, packet_manager, jokes_config)
 
 ground_station = GroundStation(
     logger,