Merge branch 'main' into board-definition

Author: Mikefly123

CMakePresets.json

@@ -3,18 +3,18 @@
         {
             "binaryDir": "${sourceDir}/build-fprime-automatic-zephyr",
             "cacheVariables": {
-                "BOARD": "teensy41",
+                "BOARD": "proves_flight_control_board_v5c/rp2350a/m33",
                 "CMAKE_BUILD_TYPE": "Release",
                 "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
             },
             "description": "F\u00b4 release build using local fprime-venv",
-            "displayName": "F\u00b4 Zephyr (teensy41)",
+            "displayName": "F\u00b4 FPrime Zephyr PROVES",
             "environment": {
                 "PATH": "$env{VIRTUAL_ENV}/bin:$penv{PATH}",
                 "VIRTUAL_ENV": "${fileDir}/fprime-venv"
             },
             "generator": "Ninja",
-            "name": "fprime-zephyr-teensy41",
+            "name": "fprime-zephyr-proves",
             "toolchainFile": "${fileDir}/lib/fprime-zephyr/cmake/toolchain/zephyr.cmake"
         }
     ],

Makefile

@@ -13,15 +13,14 @@ submodules: ## Initialize and update git submodules
 	git submodule update --init --recursive
 
 export VIRTUAL_ENV ?= $(shell pwd)/fprime-venv
-fprime-venv: uv ## Create a virtual environment
-	@test -s $(VIRTUAL_ENV) || { \
-		echo "Creating virtual environment..."; \
-		$(UV) venv fprime-venv; \
-		$(UV) pip install --requirement requirements.txt; \
-	}
+fprime-venv: ## Create a virtual environment
+		@$(MAKE) uv
+		@echo "Creating virtual environment..."
+		@$(UV) venv fprime-venv
+		@$(UV) pip install --requirement requirements.txt
 
 .PHONY: zephyr-setup
-zephyr-setup: uv ## Set up Zephyr environment
+zephyr-setup: fprime-venv ## Set up Zephyr environment
 	@test -s lib/zephyr-workspace/tools/edtt/.gitignore || { \
 		echo "Setting up Zephyr environment..."; \
 		cd lib/zephyr-workspace && \
@@ -34,45 +33,34 @@ zephyr-setup: uv ## Set up Zephyr environment
 ##@ Development
 
 .PHONY: pre-commit-install
-pre-commit-install: uv
-	@echo "Installing pre-commit hooks..."
+pre-commit-install: uv ## Install pre-commit hooks
 	@$(UVX) pre-commit install > /dev/null
 
 .PHONY: fmt
 fmt: pre-commit-install ## Lint and format files
-	$(UVX) pre-commit run --all-files
+	@$(UVX) pre-commit run --all-files
 
 .PHONY: generate
 generate: submodules fprime-venv zephyr-setup ## Generate FPrime-Zephyr Proves Core Reference
 	@echo "Generating FPrime-Zephyr Proves Core Reference..."
-	$(UV) run fprime-util generate --force
+	@$(UV) run fprime-util generate --force
 
 .PHONY: generate-if-needed
 BUILD_DIR ?= $(shell pwd)/build-fprime-automatic-zephyr
 generate-if-needed:
 	@test -s $(BUILD_DIR) || $(MAKE) generate
 
 .PHONY: build
-build: generate-if-needed ## Build FPrime-Zephyr Proves Core Reference
-	@echo "Building FPrime code..."
+build: fprime-venv generate-if-needed ## Build FPrime-Zephyr Proves Core Reference
+	@echo "Building..."
 	@$(UV) run fprime-util build
 
-.PHONY: list-tty
-list-tty: arduino-cli ## List available TTY ports
-	@echo "TTY ports:"
-	@$(ARDUINO_CLI) board list | grep "USB" | awk '{print $$1}'
-
-.PHONY: install
-UF2 ?= $(BUILD_DIR)/zephyr/zephyr.uf2
-install: arduino-cli build ## Install the zephyr firmware onto a connected PROVES Kit, requires BOARD_DIR=[path-to-your-board]
-	@$(ARDUINO_CLI) config init || true
-	@$(ARDUINO_CLI) config add board_manager.additional_urls https://github.com/earlephilhower/arduino-pico/releases/download/global/package_rp2040_index.json
-	@$(ARDUINO_CLI) core install rp2040:[email protected]
-	@$(ARDUINO_CLI) upload -v -b 115200 --fqbn rp2040:rp2040:rpipico -p $(BOARD_DIR) -i $(UF2)
-
 .PHONY: clean
 clean: ## Remove all gitignored files
 	git clean -dfX
+
+.PHONY: clean-zephyr
+clean-zephyr: ## Remove all Zephyr build files
 	rm -rf lib/zephyr-workspace/bootloader lib/zephyr-workspace/modules lib/zephyr-workspace/tools
 
 ##@ Operations
@@ -98,9 +86,3 @@ UVX ?= $(UV_DIR)/uvx
 uv: $(UV) ## Download uv
 $(UV): $(BIN_DIR)
 	@test -s $(UV) || { mkdir -p $(UV_DIR); curl -LsSf https://astral.sh/uv/$(UV_VERSION)/install.sh | UV_INSTALL_DIR=$(UV_DIR) sh > /dev/null; }
-
-ARDUINO_CLI ?= $(BIN_DIR)/arduino-cli
-.PHONY: arduino-cli
-arduino-cli: $(ARDUINO_CLI) ## Download arduino-cli
-$(ARDUINO_CLI): $(BIN_DIR)
-	@test -s $(ARDUINO_CLI) || curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR=$(BIN_DIR) sh > /dev/null

README.md

@@ -36,14 +36,7 @@ make build
 
 ### Find the path to your board
 
-Next, plug in your board! If you have previously installed a firmware on your board you may not see it show up as a drive. In that case you'll want to find it's `tty` port.
-
-To do this, run the following command
-```shell
-make list-tty
-```
-
-Otherwise, you want to find the location of the board on your computer. It should be called something like RP2350 but you want to find the path to it
+Next, plug in your board! If you have previously installed a firmware on your board you may not see it show up as a drive. In that case you'll want to put the board into boot loader mode. Then you'll be able to find the location of the board on your computer. It should be called something like RP2350 but you want to find the path to it
 
 For Mac:
 ```shell
@@ -69,6 +62,7 @@ cp build-fprime-automatic-zephyr/zephyr/zephyr.uf2 [path-to-your-board]
 ```
 to copy the uf2 if the make install isn't working
 
+
 Finally, run the fprime-gds.
 ```shell
 make gds