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

Tools: cx_vehicle_bundle: add missing --defaults #289

Merged
merged 2 commits into from
Jan 2, 2025
Merged

Tools: cx_vehicle_bundle: add missing --defaults #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5120cf
Tools: cx_vehicle_bundle: add missing --defaults
robertlong13 Dec 31, 2024
f5f329f
Tools: cygwin_build: error if part of build fails
robertlong13 Dec 31, 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
3 changes: 2 additions & 1 deletion Tools/autotest/cx_vehicle_bundle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def main():
if defaults:
defaults = os.path.join(os.path.dirname(__file__), defaults)
defaults = os.path.abspath(defaults)
shutil.copy(defaults, frame_root)
shutil.copy(defaults, os.path.join(frame_root, "defaults.parm"))
# copy the scripts
script_patterns = frames[frame].get('scripts', [])
scripts_root = os.path.join(frame_root, 'scripts')
Expand All @@ -93,6 +93,7 @@ def main():
launch_line += ' -O 40.0594626,-88.5513292,206.0,0'
launch_line += ' --serial0 tcp:0'
launch_line += f' -M {frames[frame].get("model", frame)}'
launch_line += ' --defaults=defaults.parm'
launch_line += '\r\n'
f.write(launch_line)

Expand Down
3 changes: 2 additions & 1 deletion Tools/scripts/cygwin_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
# the script assumes you start in the root of the ardupilot git tree

set -x
set -e

# Get Carbonix version number
FIRMWARE_VERSION=$(grep -oP 'define AP_CUSTOM_FIRMWARE_STRING "\K(.*)(?=")' libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/version.inc)
Expand All @@ -26,7 +27,7 @@ mkdir artifacts

(
python ./waf --color yes --toolchain $TOOLCHAIN --board sitl configure --define AP_CUSTOM_FIRMWARE_STRING=\"$FIRMWARE_VERSION\" 2>&1
python ./waf plane 2>&1
python ./waf plane -j8 2>&1
) | tee artifacts/build.txt
# python ./waf copter 2>&1
# python ./waf heli 2>&1
Expand Down
Loading