Tools: add Carbonix CubeOrangePlus builds

CarbonixUAV · Sep 30, 2024 · 2be32db · 2be32db
1 parent a46f658
commit 2be32db
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/carbonix_build.yml b/.github/workflows/carbonix_build.yml
@@ -270,18 +270,20 @@ jobs:
         id: check_files
         uses: andstor/file-existence-action@v2
         with:
-          files: "build/CubeOrange/*, build/CubeOrange-Volanti/*, build/CubeOrange-Ottano/*, build/CarbonixF405/*, build/CarbonixF405-no-crystal/*"
+          files: "build/CubeOrange/*, build/CubeOrange-Volanti/*, build/CubeOrangePlus-Volanti/*, build/CubeOrange-Ottano/*, build/CubeOrangePlus-Ottano/*, build/CarbonixF405/*, build/CarbonixF405-no-crystal/*"
           fail: true
       - name: Gather build output
         run: |
           mkdir -p temp/others
-          for dir in CubeOrange CubeOrange-Volanti CubeOrange-Ottano CarbonixF405 CarbonixF405-no-crystal; do
+          for dir in CubeOrange CubeOrange-Volanti CubeOrangePlus-Volanti CubeOrange-Ottano CubeOrangePlus-Ottano CarbonixF405 CarbonixF405-no-crystal; do
             mkdir -p temp/others/$dir/bin
             cp -vr build/$dir/bin/* temp/others/$dir/bin/
           done
           cp -vr output/* temp/
           mv temp/others/CubeOrange-Volanti temp/Volanti
+          mv temp/others/CubeOrangePlus-Volanti temp/Volanti
           mv temp/others/CubeOrange-Ottano temp/Ottano
+          mv temp/others/CubeOrangePlus-Ottano temp/Ottano
           if [ -d "ArduPlane/ReleaseNotes.txt" ]; then
             cp -v ArduPlane/ReleaseNotes.txt temp/
           else

diff --git a/.github/workflows/cx_build_compare.yml b/.github/workflows/cx_build_compare.yml
@@ -24,7 +24,7 @@ jobs:
         exclude:
           - gcc: 10
             toolchain: chibios-clang
-        board: ["CubeOrange-Volanti", "CubeOrange-Ottano", "CarbonixF405", "CarbonixF405-no-crystal"]
+        board: ["CubeOrange-Volanti", "CubeOrangePlus-Volanti", "CubeOrange-Ottano", "CubeOrangePlus-Ottano", "CarbonixF405", "CarbonixF405-no-crystal"]
     steps:
       # git checkout the PR
       - uses: actions/checkout@v4

diff --git a/.github/workflows/param_check.yml b/.github/workflows/param_check.yml
@@ -228,7 +228,6 @@ jobs:
           libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/payloads/**/Cube*.par*m
           libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/payloads/**/cube*.par*m
           libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-Volanti/defaults.parm
+          libraries/AP_HAL_ChibiOS/hwdef/CubeOrangePlus-Volanti/defaults.parm
           libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-Ottano/defaults.parm
-          
-
-        
+          libraries/AP_HAL_ChibiOS/hwdef/CubeOrangePlus-Ottano/defaults.parm
diff --git a/Tools/Carbonix_scripts/build_no_clean.sh b/Tools/Carbonix_scripts/build_no_clean.sh
@@ -8,7 +8,7 @@ set -e
 # The board to build for is passed as an argument to the script
 BOARD=$1
 
-if [ "$BOARD" == "CubeOrange" ] || [ "$BOARD" == "CubeOrange-Volanti" ] || [ "$BOARD" == "CubeOrange-Ottano" ] || [ "$BOARD" == "sitl" ]
+if [ "$BOARD" == "CubeOrange" ] || [ "$BOARD" == "CubeOrange-Volanti" ] || [ "$BOARD" == "CubeOrangePlus-Volanti" ] || [ "$BOARD" == "CubeOrange-Ottano" ] || [ "$BOARD" == "CubeOrangePlus-Ottano" ] || [ "$BOARD" == "sitl" ]
 then
     echo "Compiling Plane for $BOARD..."
     ./waf plane

diff --git a/Tools/Carbonix_scripts/carbonix_waf_build.sh b/Tools/Carbonix_scripts/carbonix_waf_build.sh
@@ -6,7 +6,7 @@ set -e
 echo "Running distclean..."
 ./waf distclean
 
-main_boards=("CubeOrange" "CubeOrange-Volanti" "CubeOrange-Ottano")
+main_boards=("CubeOrange" "CubeOrange-Volanti" "CubeOrangePlus-Volanti" "CubeOrange-Ottano" "CubeOrangePlus-Ottano")
 for board in "${main_boards[@]}"; do
   echo "Compiling ArduPlane for $board..."
   ./waf configure --board "$board" -g