Add configurable spacecraft ID for CI builds

- Convert ComCfg.fpp to template (ComCfg.fpp.in)
- Add CMake option FPRIME_SPACECRAFT_ID (default 0x0044)
- Configure ComCfg.fpp generation from template
- Update CI to use spacecraft ID 0x00C1
- Add documentation for spacecraft ID configuration

Co-authored-by: Mikefly123 <[email protected]>

Author: Copilot

.github/workflows/ci.yaml

@@ -55,11 +55,11 @@ jobs:
 
       - name: Generate
         run: |
-          make generate
+          make generate FPRIME_CMAKE_OPTIONS="-DFPRIME_SPACECRAFT_ID=0x00C1"
 
       - name: Build
         run: |
-          make build
+          make build FPRIME_CMAKE_OPTIONS="-DFPRIME_SPACECRAFT_ID=0x00C1"
 
       - name: Upload build artifacts
         uses: actions/upload-artifact@v4

.gitignore

@@ -7,6 +7,9 @@ build-fprime-*
 *.template.cpp
 *.template.hpp
 
+# Generated FPP configuration files
+FprimeZephyrReference/project/config/ComCfg.fpp
+
 # Zephyr workspace
 lib/zephyr-workspace/*
 

FprimeZephyrReference/project/config/CMakeLists.txt

@@ -3,6 +3,17 @@
 #
 # Sets a list of source files for cmake to process as part of autocoding.
 ####
+
+# Configure spacecraft ID (can be overridden via CMake option)
+set(FPRIME_SPACECRAFT_ID "0x0044" CACHE STRING "Spacecraft ID (10 bits) - default 0x0044 for development, use 0x00C1 for CI")
+
+# Generate ComCfg.fpp from template with configured spacecraft ID
+configure_file(
+    "${CMAKE_CURRENT_LIST_DIR}/ComCfg.fpp.in"
+    "${CMAKE_CURRENT_LIST_DIR}/ComCfg.fpp"
+    @ONLY
+)
+
 register_fprime_config(
     CONFIGURATION_OVERRIDES
         "${CMAKE_CURRENT_LIST_DIR}/CdhCoreConfig.fpp"

FprimeZephyrReference/project/config/ComCfg.fpp renamed to FprimeZephyrReference/project/config/ComCfg.fpp.in

@@ -15,7 +15,7 @@ module ComCfg {
     # - spacecraftId
     # - TmFrameFixedSize
     # - potentially APID enum ?
-    constant SpacecraftId = 0x0044    # Spacecraft ID (10 bits)
+    constant SpacecraftId = @FPRIME_SPACECRAFT_ID@    # Spacecraft ID (10 bits)
     constant TmFrameFixedSize = 248   # Needs to be at least COM_BUFFER_MAX_SIZE + (2 * SpacePacketHeaderSize) + 1
     constant AggregationSize = TmFrameFixedSize - 6 - 6 - 1 - 2  # 2 header (6) + 1 idle byte + 2 trailer bytes
 

Makefile

@@ -41,7 +41,7 @@ fmt: pre-commit-install ## Lint and format files
 
 .PHONY: generate
 generate: submodules fprime-venv zephyr ## Generate FPrime-Zephyr Proves Core Reference
-	@$(UV_RUN) fprime-util generate --force
+	@$(UV_RUN) fprime-util generate --force $(FPRIME_CMAKE_OPTIONS)
 
 .PHONY: generate-if-needed
 BUILD_DIR ?= $(shell pwd)/build-fprime-automatic-zephyr
@@ -50,7 +50,7 @@ generate-if-needed:
 
 .PHONY: build
 build: submodules zephyr fprime-venv generate-if-needed ## Build FPrime-Zephyr Proves Core Reference
-	@$(UV_RUN) fprime-util build
+	@$(UV_RUN) fprime-util build $(FPRIME_CMAKE_OPTIONS)
 
 .PHONY: test-integration
 test-integration: uv

README.md

@@ -21,6 +21,21 @@ cd proves-core-reference
 make
 ```
 
+## Configuration
+
+### Spacecraft ID
+
+The spacecraft ID is used to identify different spacecraft/devices in the communication protocol. By default, the project uses spacecraft ID `0x0044` (68 in decimal) for development builds.
+
+To build with a different spacecraft ID, use the `FPRIME_CMAKE_OPTIONS` variable:
+
+```shell
+make generate FPRIME_CMAKE_OPTIONS="-DFPRIME_SPACECRAFT_ID=0x00C1"
+make build FPRIME_CMAKE_OPTIONS="-DFPRIME_SPACECRAFT_ID=0x00C1"
+```
+
+**Note:** CI builds automatically use spacecraft ID `0x00C1` (193 in decimal) to prevent conflicts with development devices.
+
 ## Running the code
 
 Run generate from the `proves-core-reference` directory. This generates the build cache for FPrime. You only need to do generate if something in the core FPrime package has changed