From 556b99892f4df662a6fb1045c3c59d69d57b2f39 Mon Sep 17 00:00:00 2001 From: Michael Pham <61564344+Mikefly123@users.noreply.github.com> Date: Fri, 26 Sep 2025 12:55:15 -0700 Subject: [PATCH 1/5] Bump PySquared Version --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a61f49c..f81de89 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PYSQUARED_VERSION ?= v2.0.0-alpha-25w34 +PYSQUARED_VERSION ?= v2.0.0-alpha-25w39 PYSQUARED ?= git+https://github.com/proveskit/pysquared@$(PYSQUARED_VERSION) BOARD_MOUNT_POINT ?= "" BOARD_TTY_PORT ?= "" From 62656d002a07d45d49af36b4ccaa29675e80f45b Mon Sep 17 00:00:00 2001 From: Michael Pham <61564344+Mikefly123@users.noreply.github.com> Date: Fri, 26 Sep 2025 12:57:42 -0700 Subject: [PATCH 2/5] Replaced Sleep Helper with CDH Listen --- src/flight-software/main.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/flight-software/main.py b/src/flight-software/main.py index 33ab8c1..5713455 100644 --- a/src/flight-software/main.py +++ b/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") From ca122b02a88bd720d65a27c5e92cfbf386720b8d Mon Sep 17 00:00:00 2001 From: Nate Gay Date: Sat, 27 Sep 2025 13:08:46 -0500 Subject: [PATCH 3/5] Update pysquared reference --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f81de89..7db5f7f 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PYSQUARED_VERSION ?= v2.0.0-alpha-25w39 -PYSQUARED ?= git+https://github.com/proveskit/pysquared@$(PYSQUARED_VERSION) +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) From 8e28e0339a1c64538f1b26db9d0f58bb8edf021f Mon Sep 17 00:00:00 2001 From: Michael Pham <61564344+Mikefly123@users.noreply.github.com> Date: Sun, 28 Sep 2025 11:43:40 -0700 Subject: [PATCH 4/5] HOTFIX: Remove Magnetometer From Beacon --- src/flight-software/main.py | 3 ++- src/flight-software/repl.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/flight-software/main.py b/src/flight-software/main.py index 5713455..a7309c9 100644 --- a/src/flight-software/main.py +++ b/src/flight-software/main.py @@ -121,7 +121,8 @@ uhf_packet_manager, boot_time, imu, - magnetometer, + # TODO (mikefly123): add back in magnetometer once it is fixed upstream + # magnetometer, uhf_radio, sband_radio, error_count, diff --git a/src/flight-software/repl.py b/src/flight-software/repl.py index b97c533..839a383 100644 --- a/src/flight-software/repl.py +++ b/src/flight-software/repl.py @@ -130,7 +130,8 @@ def get_temp(sensor): uhf_packet_manager, time.monotonic(), imu, - magnetometer, + # TODO (mikefly123): add back in magnetometer once it is fixed upstream + # magnetometer, uhf_radio, sband_radio, ) From c9fdbc8b2f450d19725dc1c243590d9e912365a7 Mon Sep 17 00:00:00 2001 From: Michael Pham <61564344+Mikefly123@users.noreply.github.com> Date: Tue, 30 Sep 2025 17:59:16 -0700 Subject: [PATCH 5/5] Update to 25w40 --- Makefile | 2 +- src/flight-software/main.py | 3 +-- src/flight-software/repl.py | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 7db5f7f..d547af6 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PYSQUARED_VERSION ?= v2.0.0-alpha-25w39 +PYSQUARED_VERSION ?= v2.0.0-alpha-25w40 PYSQUARED ?= git+https://github.com/proveskit/pysquared@$(PYSQUARED_VERSION)\#subdirectory=circuitpython-workspaces/flight-software BOARD_MOUNT_POINT ?= "" BOARD_TTY_PORT ?= "" diff --git a/src/flight-software/main.py b/src/flight-software/main.py index a7309c9..5713455 100644 --- a/src/flight-software/main.py +++ b/src/flight-software/main.py @@ -121,8 +121,7 @@ uhf_packet_manager, boot_time, imu, - # TODO (mikefly123): add back in magnetometer once it is fixed upstream - # magnetometer, + magnetometer, uhf_radio, sband_radio, error_count, diff --git a/src/flight-software/repl.py b/src/flight-software/repl.py index 839a383..b97c533 100644 --- a/src/flight-software/repl.py +++ b/src/flight-software/repl.py @@ -130,8 +130,7 @@ def get_temp(sensor): uhf_packet_manager, time.monotonic(), imu, - # TODO (mikefly123): add back in magnetometer once it is fixed upstream - # magnetometer, + magnetometer, uhf_radio, sband_radio, )