Split flight and ground station software

Author: nateinaction

.gitignore

@@ -12,6 +12,10 @@ venv
 firmware.uf2
 
 # libs
-/lib/*
-!/lib/requirements.txt
-!/lib/proveskit_rp2040_v4/
+flight-software/src/lib/*
+!flight-software/src/lib/requirements.txt
+!flight-software/src/lib/proveskit_rp2040_v4/
+
+ground-station/src/lib/*
+!ground-station/src/lib/requirements.txt
+!ground-station/src/lib/proveskit_rp2040_v4/

Makefile

@@ -14,16 +14,20 @@ help: ## Display this help.
 	@echo "Creating virtual environment..."
 	@$(MAKE) uv
 	@$(UV) venv
-	@$(UV) pip install --requirement pyproject.toml
+	@$(UV) pip install --requirement flight-software/pyproject.toml
+	@$(UV) pip install --requirement ground-station/pyproject.toml
 
 .PHONY: download-libraries
-download-libraries: uv .venv ## Download the required libraries
-	@echo "Downloading libraries..."
-	@$(UV) pip install --requirement lib/requirements.txt --target lib --no-deps --upgrade --quiet
-	@$(UV) pip --no-cache install $(PYSQUARED) --target lib --no-deps --upgrade --quiet
+download-libraries: download-libraries/flight-software download-libraries/ground-station
 
-	@rm -rf lib/*.dist-info
-	@rm -rf lib/.lock
+.PHONY: download-libraries/%
+download-libraries/%: uv .venv ## Download the required libraries
+	@echo "Downloading libraries for $*..."
+	@$(UV) pip install --requirement $*/src/lib/requirements.txt --target $*/src/lib --no-deps --upgrade --quiet
+	@$(UV) pip --no-cache install $(PYSQUARED) --target $*/src/lib --no-deps --upgrade --quiet
+
+	@rm -rf $*/src/lib/*.dist-info
+	@rm -rf $*/src/lib/.lock
 
 .PHONY: pre-commit-install
 pre-commit-install: uv
@@ -45,13 +49,13 @@ BOARD_MOUNT_POINT ?= ""
 VERSION ?= $(shell git tag --points-at HEAD --sort=-creatordate < /dev/null | head -n 1)
 
 .PHONY: install
-install: build ## Install the project onto a connected PROVES Kit use `make install BOARD_MOUNT_POINT=/my_board_destination/` to specify the mount point
+install-%: build-% ## Install the project onto a connected PROVES Kit use `make install BOARD_MOUNT_POINT=/my_board_destination/` to specify the mount point
 ifeq ($(OS),Windows_NT)
 	rm -rf $(BOARD_MOUNT_POINT)
-	cp -r artifacts/proves/* $(BOARD_MOUNT_POINT)
+	cp -r artifacts/proves/$*/* $(BOARD_MOUNT_POINT)
 else
 	@rm $(BOARD_MOUNT_POINT)/code.py > /dev/null 2>&1 || true
-	$(call rsync_to_dest,artifacts/proves,$(BOARD_MOUNT_POINT))
+	$(call rsync_to_dest,artifacts/proves/$*,$(BOARD_MOUNT_POINT))
 endif
 
 # install-firmware
@@ -66,15 +70,18 @@ clean: ## Remove all gitignored files such as downloaded libraries and artifacts
 ##@ Build
 
 .PHONY: build
-build: download-libraries mpy-cross ## Build the project, store the result in the artifacts directory
-	@echo "Creating artifacts/proves"
-	@mkdir -p artifacts/proves
-	@echo "__version__ = '$(VERSION)'" > artifacts/proves/version.py
-	$(call compile_mpy)
-	$(call rsync_to_dest,.,artifacts/proves/)
-	@$(UV) run python -c "import os; [os.remove(os.path.join(root, file)) for root, _, files in os.walk('artifacts/proves/lib') for file in files if file.endswith('.py')]"
-	@echo "Creating artifacts/proves.zip"
-	@zip -r artifacts/proves.zip artifacts/proves > /dev/null
+build: build-flight-software build-ground-station ## Build all projects
+
+.PHONY: build-*
+build-%: download-libraries/% mpy-cross ## Build the project, store the result in the artifacts directory
+	@echo "Creating artifacts/proves/$*"
+	@mkdir -p artifacts/proves/$*
+	@echo "__version__ = '$(VERSION)'" > artifacts/proves/$*/version.py
+	$(call compile_mpy,$*)
+	$(call rsync_to_dest,$*/src,artifacts/proves/$*/)
+	@$(UV) run python -c "import os; [os.remove(os.path.join(root, file)) for root, _, files in os.walk('artifacts/proves/$*/lib') for file in files if file.endswith('.py')]"
+	@echo "Creating artifacts/proves/$*.zip"
+	@zip -r artifacts/proves/$*.zip artifacts/proves/$* > /dev/null
 
 define rsync_to_dest
 	@if [ -z "$(1)" ]; then \
@@ -87,7 +94,7 @@ define rsync_to_dest
 		exit 1; \
 	fi
 
-	@rsync -avh $(1)/config.json artifacts/proves/version.py $(1)/*.py $(1)/lib --exclude=".*" --exclude='requirements.txt' --exclude='__pycache__' $(2) --delete --times --checksum
+	@rsync -avh ./config.json $(2)/version.py $(1)/*.py $(1)/lib --exclude=".*" --exclude='requirements.txt' --exclude='__pycache__' $(2) --delete --times --checksum
 endef
 
 ##@ Build Tools
@@ -136,5 +143,5 @@ endif
 endif
 
 define compile_mpy
-	@$(UV) run python -c "import os, subprocess; [subprocess.run(['$(MPY_CROSS)', os.path.join(root, file)]) for root, _, files in os.walk('lib') for file in files if file.endswith('.py')]" || exit 1
+	@$(UV) run python -c "import os, subprocess; [subprocess.run(['$(MPY_CROSS)', os.path.join(root, file)]) for root, _, files in os.walk('$(1)/src/lib') for file in files if file.endswith('.py')]" || exit 1
 endef

config.json

@@ -57,6 +57,7 @@
 "turbo_clock": false,
 "radio": {
     "license": "KK4PDM",
+    "modulation": "LoRa",
     "receiver_id": 250,
     "sender_id": 251,
     "start_time": 80000,

pyproject.toml flight-software/pyproject.tomlpyproject.toml renamed to flight-software/pyproject.toml

@@ -13,6 +13,10 @@ dependencies = [
     "pytest==8.3.2",
 ]
 
+[tool.setuptools.packages.find]
+where = ["src/"]
+include = ["circuitpython_rp2040_v4.flight_software"]
+
 [tool.ruff.format]
 # Use `\n` line endings for all files
 line-ending = "lf"