From 0062c0dc1c78cca0ef3e507f9298b13da3ab19a0 Mon Sep 17 00:00:00 2001 From: Michael Pham <61564344+Mikefly123@users.noreply.github.com> Date: Sun, 28 Sep 2025 11:55:54 -0700 Subject: [PATCH 1/3] Bump PySquared Version --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9761647..cc01787 100644 --- a/Makefile +++ b/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-25w39 +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 19f0384f18bb8481ba2ac37c7f0065f31760adb5 Mon Sep 17 00:00:00 2001 From: Michael Pham <61564344+Mikefly123@users.noreply.github.com> Date: Sun, 28 Sep 2025 11:57:47 -0700 Subject: [PATCH 2/3] Update Main to Remove Sleeps --- src/flight-software/main.py | 7 +++++-- src/flight-software/repl.py | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/flight-software/main.py b/src/flight-software/main.py index b0bbdbf..6e0ffd0 100644 --- a/src/flight-software/main.py +++ b/src/flight-software/main.py @@ -114,7 +114,8 @@ packet_manager, boot_time, imu, - magnetometer, + # TODO (mikefly123): add back in magnetometer once it is fixed upstream + # magnetometer, radio, error_count, boot_count, @@ -132,7 +133,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") diff --git a/src/flight-software/repl.py b/src/flight-software/repl.py index 4c1275a..25157de 100644 --- a/src/flight-software/repl.py +++ b/src/flight-software/repl.py @@ -100,7 +100,8 @@ packet_manager, boot_time, imu, - magnetometer, + # TODO (mikefly123): add back in magnetometer once it is fixed upstream + # magnetometer, radio, ) From e2f5791619e4a0465abce00f10f613d208ba84b9 Mon Sep 17 00:00:00 2001 From: Michael Pham Date: Tue, 30 Sep 2025 17:55:37 -0700 Subject: [PATCH 3/3] 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 cc01787..4ec071c 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 6e0ffd0..0a5a959 100644 --- a/src/flight-software/main.py +++ b/src/flight-software/main.py @@ -114,8 +114,7 @@ packet_manager, boot_time, imu, - # TODO (mikefly123): add back in magnetometer once it is fixed upstream - # magnetometer, + magnetometer, radio, error_count, boot_count, diff --git a/src/flight-software/repl.py b/src/flight-software/repl.py index 25157de..4c1275a 100644 --- a/src/flight-software/repl.py +++ b/src/flight-software/repl.py @@ -100,8 +100,7 @@ packet_manager, boot_time, imu, - # TODO (mikefly123): add back in magnetometer once it is fixed upstream - # magnetometer, + magnetometer, radio, )