Added pixi environment for the ease of bootstrapping new development machines

Author: xtitoris

.gitattributes

@@ -1,2 +1,4 @@
 
 *.sh text eol=lf
+# SCM syntax highlighting & preventing 3-way merges
+pixi.lock merge=binary linguist-language=YAML linguist-generated=true -diff

.github/workflows/build-firmware.yaml

@@ -22,26 +22,17 @@ jobs:
         with:
           submodules: recursive
 
-      # Build machines don't have arm-none-eabi gcc, so let's download it and put it on the path
-      - name: Download & Install GCC
-        env:
-          ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
-        run: | # Compiler hosted on our other git repo - avoids having to download from the nice folks at ARM every time
-          wget 'https://github.com/rusefi/build_support/raw/master/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi.tar.xz' -O compiler.tar.xz
-          tar -xvf compiler.tar.xz
-          echo "::add-path::`pwd`/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi/bin"
-
-      # Make sure the compiler we just downloaded works - just print out the version
-      - name: Test Compiler
-        run: arm-none-eabi-gcc -v
+      - uses: prefix-dev/setup-pixi@v0.9.4
+        with:
+          pixi-version: v0.63.2
+          cache: true
 
       - name: Install build tools
         run: |
           sudo apt-get install srecord libarchive-zip-perl
 
       - name: Build Firmware
-        working-directory: ./firmware/boards/${{matrix.build-target}}
-        run: ./build_wideband.sh
+        run: pixi run build ${{matrix.build-target}}
 
       - name: Attach binaries
         uses: actions/upload-artifact@v4

.gitignore

@@ -65,3 +65,6 @@ build/
 
 # cortex-debug vscode extension local state
 .vscode/.cortex-debug*state.json
+# pixi environments
+.pixi/*
+!.pixi/config.toml

firmware/boards/build_f1_board.sh

@@ -30,11 +30,19 @@ mkdir -p ${DELIVER_DIR}
 rm -f ${DELIVER_DIR}/*
 
 if uname | grep "NT"; then
-  HEX2DFU=./ext/encedo_hex2dfu/hex2dfu.exe
+  if command -v hex2dfu.exe >/dev/null 2>&1; then
+    HEX2DFU=hex2dfu.exe
+  else
+    HEX2DFU=./ext/encedo_hex2dfu/hex2dfu.exe
+  fi
   SREC_CAT=srec_cat.exe
 else
-  HEX2DFU=./ext/encedo_hex2dfu/hex2dfu.bin
-  chmod u+x $HEX2DFU
+  if command -v hex2dfu >/dev/null 2>&1; then
+    HEX2DFU=hex2dfu
+  else
+    HEX2DFU=./ext/encedo_hex2dfu/hex2dfu.bin
+    chmod u+x $HEX2DFU
+  fi
   SREC_CAT=srec_cat
 fi
 

pixi.lock

@@ -0,0 +1,35 @@
+[workspace]
+channels = ["conda-forge", "xtitoris"]
+name = "wideband"
+platforms = ["win-64", "linux-64", "osx-arm64"]
+version = "0.1.0"
+
+[tasks]
+clean = { cmd = "make clean", cwd = "firmware" }
+build-tests = { cmd = "make -j8", cwd = "test" }
+tests = { cmd = "build/wideband_test", cwd = "test", depends-on = ["build-tests"], env = { SAN_OPTIONS = "detect_stack_use_after_return=1" } }
+
+[tasks.build]
+args = ["board"]
+cmd = "cd firmware/boards/{{ board }} && bash build_wideband.sh"
+
+[dependencies]
+make = ">=4.4.1,<5"
+arm-gnu-toolchain = ">=15.2.rel1,<16"
+hex2dfu = ">=0.21.0,<0.22"
+srecord = ">=1.65,<2"
+
+[target.linux-64.dependencies]
+gcc = ">=15.2.0,<15.3"
+gxx = ">=15.2.0,<15.3"
+
+[target.win-64.dependencies]
+m2-coreutils = "*"
+m2-bash = "*"
+m2-grep = "*"
+gcc = ">=15.2.0,<15.3"
+gxx = ">=15.2.0,<15.3"
+
+[target.osx-arm64.dependencies]
+clang = ">=19.1.7,<19.2"
+clangxx = ">=19.1.7,<19.2"

pixi.toml

@@ -130,12 +130,21 @@ else
   TRGT =
 endif
 
+ifeq ($(IS_MAC),yes)
+CC   = clang
+CPPC = clang++
+LD   = clang++
+CP   = $(TRGT)objcopy
+AS   = clang -x assembler-with-cpp
+OD   = $(TRGT)objdump
+else
 CC   = $(TRGT)gcc
 CPPC = $(TRGT)g++
 LD   = $(TRGT)g++
 CP   = $(TRGT)objcopy
 AS   = $(TRGT)gcc -x assembler-with-cpp
 OD   = $(TRGT)objdump
+endif
 HEX  = $(CP) -O ihex
 BIN  = $(CP) -O binary
 
@@ -206,3 +215,9 @@ endif
 PROJECT = wideband_test
 
 include rules.mk
+
+# Clean main firmware build artifacts when "make clean" is run in the test directory, since the test code depends on the firmware code
+# and will not compile if the firmware code was previously built for a different target
+CLEAN_RULE_HOOK:
+	$(MAKE) -C $(FIRMWARE_DIR) clean || true
+	rm -rf $(FIRMWARE_DIR)/.dep $(FIRMWARE_DIR)/build