Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hwdef: add CubeOrangePlus for Volanti and Ottano #217

Merged
merged 4 commits into from
Oct 3, 2024
Merged

hwdef: add CubeOrangePlus for Volanti and Ottano #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
828364c
hwdef: CarbonixCommon: cx_cubecarrier.inc
robertlong13 Sep 30, 2024
fa3ea9e
hwdef: add CubeOrangePlus-Ottano
robertlong13 Sep 30, 2024
a46f658
hwdef: add CubeOrangePlus-Volanti
robertlong13 Sep 30, 2024
19e3c20
Tools: add Carbonix CubeOrangePlus builds
robertlong13 Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/carbonix_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/CubeOrangePlus/*, 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 CubeOrangePlus 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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cx_build_compare.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/param_check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion Tools/Carbonix_scripts/build_no_clean.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" == "CubeOrangePlus" ] || [ "$BOARD" == "CubeOrange-Volanti" ] || [ "$BOARD" == "CubeOrangePlus-Volanti" ] || [ "$BOARD" == "CubeOrange-Ottano" ] || [ "$BOARD" == "CubeOrangePlus-Ottano" ] || [ "$BOARD" == "sitl" ]
then
echo "Compiling Plane for $BOARD..."
./waf plane
Expand Down
2 changes: 1 addition & 1 deletion Tools/Carbonix_scripts/carbonix_waf_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -e
echo "Running distclean..."
./waf distclean

main_boards=("CubeOrange" "CubeOrange-Volanti" "CubeOrange-Ottano")
main_boards=("CubeOrange" "CubeOrangePlus" "CubeOrange-Volanti" "CubeOrangePlus-Volanti" "CubeOrange-Ottano" "CubeOrangePlus-Ottano")
for board in "${main_boards[@]}"; do
echo "Compiling ArduPlane for $board..."
./waf configure --board "$board" -g
Expand Down
5 changes: 0 additions & 5 deletions ...ibiOS/hwdef/CarbonixCommon/cubeorange.inc → ...S/hwdef/CarbonixCommon/cx_cubecarrier.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# hw definition file for processing by chibios_hwdef.py

include ../CubeOrange/hwdef.dat
include ./features.inc
include ./version.inc

Expand All @@ -18,5 +15,3 @@ define HAL_IMU_TEMP_DEFAULT 60

# Set default airspeed type to DroneCAN
define HAL_AIRSPEED_TYPE_DEFAULT TYPE_UAVCAN

USE_BOOTLOADER_FROM_BOARD CubeOrange
4 changes: 3 additions & 1 deletion libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-Ottano/hwdef.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
include ../CarbonixCommon/cubeorange.inc
include ../CubeOrange/hwdef.dat
include ../CarbonixCommon/cx_cubecarrier.inc
USE_BOOTLOADER_FROM_BOARD CubeOrange
4 changes: 3 additions & 1 deletion libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-Volanti/hwdef.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
include ../CarbonixCommon/cubeorange.inc
include ../CubeOrange/hwdef.dat
include ../CarbonixCommon/cx_cubecarrier.inc
USE_BOOTLOADER_FROM_BOARD CubeOrange
1 change: 1 addition & 0 deletions libraries/AP_HAL_ChibiOS/hwdef/CubeOrangePlus-Ottano/defaults.parm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@include ../CubeOrange-Ottano/defaults.parm
3 changes: 3 additions & 0 deletions libraries/AP_HAL_ChibiOS/hwdef/CubeOrangePlus-Ottano/hwdef.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
include ../CubeOrangePlus/hwdef.dat
include ../CarbonixCommon/cx_cubecarrier.inc
USE_BOOTLOADER_FROM_BOARD CubeOrangePlus
1 change: 1 addition & 0 deletions libraries/AP_HAL_ChibiOS/hwdef/CubeOrangePlus-Ottano/scripts/cx_built_in_test.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../CarbonixCommon/scripts/cx_built_in_test.lua
1 change: 1 addition & 0 deletions libraries/AP_HAL_ChibiOS/hwdef/CubeOrangePlus-Ottano/scripts/cx_led_driver.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../CarbonixCommon/scripts/cx_led_driver.lua
1 change: 1 addition & 0 deletions libraries/AP_HAL_ChibiOS/hwdef/CubeOrangePlus-Volanti/defaults.parm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@include ../CubeOrange-Volanti/defaults.parm
3 changes: 3 additions & 0 deletions libraries/AP_HAL_ChibiOS/hwdef/CubeOrangePlus-Volanti/hwdef.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
include ../CubeOrangePlus/hwdef.dat
include ../CarbonixCommon/cx_cubecarrier.inc
USE_BOOTLOADER_FROM_BOARD CubeOrangePlus
1 change: 1 addition & 0 deletions libraries/AP_HAL_ChibiOS/hwdef/CubeOrangePlus-Volanti/scripts/cx_built_in_test.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../CarbonixCommon/scripts/cx_built_in_test.lua
1 change: 1 addition & 0 deletions libraries/AP_HAL_ChibiOS/hwdef/CubeOrangePlus-Volanti/scripts/cx_led_driver.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../CarbonixCommon/scripts/cx_led_driver.lua
Loading