Merge branch 'main' of github.com:Open-Source-Space-Foundation/proves-core-reference into burnwire

Author: ineskhou

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"
         }
     ],

FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentTopology.cpp

@@ -13,18 +13,7 @@
 
 #include <zephyr/drivers/gpio.h>
 
-static const struct gpio_dt_spec ledGpio = GPIO_DT_SPEC_GET(DT_ALIAS(led0), gpios);
-// static const struct gpio_dt_spec burnwire0Gpio = GPIO_DT_SPEC_GET(DT_ALIAS(burnwire0), gpio
-static const struct gpio_dt_spec burnwire0Gpio = {
-    .port = DEVICE_DT_GET(DT_NODELABEL(gpio0)),
-    .pin = 28,  // 28
-    .dt_flags = GPIO_ACTIVE_HIGH,
-};
-static const struct gpio_dt_spec burnwire1Gpio = {
-    .port = DEVICE_DT_GET(DT_NODELABEL(gpio0)),
-    .pin = 29,  // 29
-    .dt_flags = GPIO_ACTIVE_HIGH,
-};
+static const struct gpio_dt_spec ledGpio = GPIO_DT_SPEC_GET(DT_NODELABEL(led0), gpios);
 
 // Allows easy reference to objects in FPP/autocoder required namespaces
 using namespace ReferenceDeployment;

Makefile

@@ -15,14 +15,14 @@ submodules: ## Initialize and update git submodules
 
 
 export VIRTUAL_ENV ?= $(shell pwd)/fprime-venv
-fprime-venv: uv ## Create a virtual environment
-		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 && \
@@ -35,45 +35,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: submodules zephyr-setup 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
@@ -99,9 +88,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
@@ -60,7 +53,7 @@ findmnt
 
 Now you want to install the firmware to the board.
 ```shell
-make install BOARD_DIR=[path-to-your-board]
+cp build-artifacts/zephyr.uf2 [path-to-your-board]
 ```
 
 Finally, run the fprime-gds.

boards/bronco_space/proves_flight_control_board_v5/Kconfig.defconfig

@@ -0,0 +1,12 @@
+config SOC_RP2350A_M33
+    bool "Enable Arm cores"
+    default y
+
+config USB_SELF_POWERED
+	default n
+
+config USB_CDC_ACM_LOG_LEVEL
+	default 0
+
+config USB_DEVICE_LOG_LEVEL
+	default 1

boards/bronco_space/proves_flight_control_board_v5/proves_flight_control_board_v5-pinctrl.dtsi

@@ -0,0 +1,20 @@
+#include <zephyr/dt-bindings/pinctrl/rpi-pico-rp2350a-pinctrl.h>
+
+&pinctrl {
+	spi1_default: spi1_default {
+		group1 {
+			pinmux = <SPI1_SCK_P10>, <SPI1_TX_P11>;
+		};
+
+		group2 {
+			pinmux = <SPI1_RX_P8>;
+			input-enable;
+		};
+	};
+	i2c1_default: i2c1_default {
+		group1 {
+			pinmux = <I2C1_SCL_P3>, <I2C1_SDA_P2>;
+			input-enable;
+		};
+	};
+};

boards/bronco_space/proves_flight_control_board_v5/proves_flight_control_board_v5.dtsi

@@ -0,0 +1,132 @@
+#include <freq.h>
+
+#include <zephyr/dt-bindings/i2c/i2c.h>
+#include <zephyr/dt-bindings/pwm/pwm.h>
+
+#include "proves_flight_control_board_v5-pinctrl.dtsi"
+
+/ {
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zephyr,console = &cdc_acm_uart0;
+		zephyr,shell-uart = &cdc_acm_uart0;
+		zephyr,code-partition = &code_partition;
+	};
+
+	aliases {
+		watchdog0 = &wdt0;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		led0: led0 {
+			gpios = <&gpio0 24 GPIO_ACTIVE_HIGH>;
+			label = "User LED GPIO24";
+		};
+	};
+};
+
+zephyr_udc0: &usbd {
+	status = "okay";
+};
+
+&zephyr_udc0  {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
+};
+
+&flash0 {
+	reg = <0x10000000 DT_SIZE_M(4)>;
+
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		/* Reserved memory for an image definition block. The block is much
+		* smaller than 256 bytes, but in practice the linker places the vector
+		* table at a much larger alignment offset.
+		*/
+		image_def: partition@0 {
+			label = "image_def";
+			reg = <0x00000000 0x100>;
+			read-only;
+		};
+
+		/*
+		* Usable flash. Starts at 0x100, after the image definition block.
+		* The partition size is 4MB minus the 0x100 bytes taken by the
+		* image definition.
+		*/
+		code_partition: partition@100 {
+			label = "code-partition";
+			reg = <0x100 (DT_SIZE_M(4) - 0x100)>;
+			read-only;
+		};
+	};
+};
+
+&timer0 {
+	status = "okay";
+};
+
+&wdt0 {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&spi1 {
+	status = "okay";
+	cs-gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
+	pinctrl-0 = <&spi1_default>;
+	pinctrl-names = "default";
+
+	lora0: sx1276@0 {
+		compatible = "semtech,sx1276";
+		reg = <0>;
+		spi-max-frequency = <125000>;
+		dio-gpios =  <&gpio0 13 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>,<&gpio0 12 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>;
+		reset-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
+		power-amplifier-output = "pa-boost";
+		label = "HOPE_RF";
+	};
+};
+
+&i2c1 {
+	status = "okay";
+	pinctrl-0 = <&i2c1_default>;
+	pinctrl-names = "default";
+	clock-frequency = <100000>;
+
+	lsm6dso0: lsm6dso0@6b {
+		compatible = "st,lsm6dso";
+		reg = <0x6b>;
+		label = "LSM6DSO";
+	};
+
+	lis2mdl: lis2mdl@1e {
+		compatible = "st,lis2mdl";
+		reg = <0x1e>;
+		label = "LIS2MDL";
+	};
+	rv3028: rv3028@52 {
+		compatible = "microcrystal,rv3028";
+		reg = <0x52>;
+		int-gpios = <&gpio0 27 GPIO_ACTIVE_HIGH>;
+		backup-switch-mode = "level";
+		label = "RV3028";
+	};
+	ina219: ina219@40 {
+		compatible = "ti,ina219";
+		reg = <0x40>;
+		shunt-milliohm = <2>;
+		lsb-microamp = <100>;
+		label = "INA219";
+	};
+};

boards/bronco_space/proves_flight_control_board_v5c/Kconfig.proves_flight_control_board_v5c

@@ -0,0 +1 @@
+source "../../../boards/bronco_space/proves_flight_control_board_v5/Kconfig.defconfig"

boards/bronco_space/proves_flight_control_board_v5c/board.cmake

@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: Apache-2.0
+
+if("${RPI_PICO_DEBUG_ADAPTER}" STREQUAL "")
+	set(RPI_PICO_DEBUG_ADAPTER "cmsis-dap")
+endif()
+
+board_runner_args(openocd --cmd-pre-init "source [find interface/${RPI_PICO_DEBUG_ADAPTER}.cfg]")
+board_runner_args(openocd --cmd-pre-init "source [find target/rp2350.cfg]")
+
+# The adapter speed is expected to be set by interface configuration.
+# The Raspberry Pi's OpenOCD fork doesn't, so match their documentation at
+# https://www.raspberrypi.com/documentation/microcontrollers/debug-probe.html#debugging-with-swd
+board_runner_args(openocd --cmd-pre-init "set_adapter_speed_if_not_set 5000")
+
+board_runner_args(jlink "--device=RP2350_M33_0")
+board_runner_args(uf2 "--board-id=RP2350")
+
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)

boards/bronco_space/proves_flight_control_board_v5c/board.yml

@@ -0,0 +1,6 @@
+board:
+  name: proves_flight_control_board_v5c
+  full_name: PROVES Flight Control Board v5c
+  vendor: Bronco Space
+  socs:
+  - name: rp2350a