Merge branch 'master' into quintuna_cpp

.github/actions/build_binary/action.yml

@@ -24,5 +24,5 @@ runs:
     - name: Build
       shell: bash
       run: |
-        cmake -B ${{ inputs.build_dir }} -DPLATFORM=firmware -DTARGET=deploy -DHANDLE_DEPS=OFF -DFIX_FORMATTING=OFF
-        xvfb-run make --directory=${{ inputs.build_dir }} -j`nproc` ${{ inputs.board }}.hex
+        cmake --preset "FW Deploy CI" -B ${{ inputs.build_dir }}
+        xvfb-run cmake --build ${{ inputs.build_dir }} --target ${{ inputs.board }}.hex

.github/workflows/ci.yml

@@ -112,7 +112,7 @@ jobs:
         with:
           board: ${{ matrix.board }}
 
-  test:
+  test-firmware:
     needs: [ clang-format ]
     name: Test Firmware
     runs-on: ubuntu-22.04
@@ -153,8 +153,8 @@ jobs:
 
       - name: Build
         run: |
-          cmake -B $BUILD_DIR -DPLATFORM=firmware -DTARGET=test -DHANDLE_DEPS=OFF -DFIX_FORMATTING=OFF
-          make --directory=$BUILD_DIR -j`nproc` ${{ matrix.car }}_${{ matrix.board }}_test
+          cmake --preset "FW Test CI" -B $BUILD_DIR
+          cmake --build $BUILD_DIR --target ${{ matrix.car }}_${{ matrix.board }}_test
 
       - name: Run Tests
         run: |
@@ -187,8 +187,8 @@ jobs:
 
       - name: Build
         run: |
-          cmake -B $BUILD_DIR -DPLATFORM=firmware -DTARGET=test -DHANDLE_DEPS=OFF -DFIX_FORMATTING=OFF
-          make --directory=$BUILD_DIR -j`nproc` shared_test
+          cmake --preset "FW Test CI" -B $BUILD_DIR
+          cmake --build $BUILD_DIR --target shared_test
 
       - name: Run tests
         run: |
@@ -221,8 +221,8 @@ jobs:
 
       - name: Build
         run: |
-          cmake -B $BUILD_DIR -DPLATFORM=firmware -DTARGET=test -DNO_VENV=ON -DHANDLE_DEPS=OFF -DFIX_FORMATTING=OFF
-          make --directory=$BUILD_DIR -j`nproc` fakegen_test
+          cmake --preset "FW Test CI" -B $BUILD_DIR
+          cmake --build $BUILD_DIR --target fakegen_test
 
       - name: Run tests
         run: |
@@ -254,6 +254,6 @@ jobs:
 
       - name: Build and install `logfs`
         run: |
-          cmake -B $BUILD_DIR -DPLATFORM=firmware -DTARGET=test -DNO_VENV=ON -DHANDLE_DEPS=OFF -DFIX_FORMATTING=OFF
-          make --directory=$BUILD_DIR -j`nproc` install_python_logfs
+          cmake --preset "FW Test CI" -B $BUILD_DIR
+          cmake --build $BUILD_DIR --target install_python_logfs
           pytest -v firmware/logfs/test

.gitignore

@@ -59,7 +59,6 @@
 # Python
 *.pyc
 __pycache__
-Pipfile.lock
 *.egg-info
 
 # Other files
@@ -138,6 +137,8 @@ can_bus/**/*.dbc
 # CMake build directories
 build_fw_deploy
 build_fw_deploy_wsl
+build_fw_dev
+build_fw_dev_wsl
 build_fw_test
 build_fw_test_wsl
 
@@ -150,5 +151,4 @@ environment/bin
 CMakeUserPresets.json
 build
 
-zadig.exe
 /can_bus/**/*.plt

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "firmware/third_party/sbgECom"]
 	path = firmware/third_party/sbgECom
 	url = https://github.com/UBCFormulaElectric/sbgECom.git
-[submodule "firmware/third_party/SEGGER_SystemView_Src"]
-	path = firmware/third_party/SEGGER_SystemView_Src
-	url = https://github.com/UBCFormulaElectric/SEGGER_SystemView_Src.git
 [submodule "software/dimos/src/assets"]
 	path = software/dimos/src/assets
 	url = https://github.com/UBCFormulaElectric/dimos-assets.git