From dadd3ee4ea6869a42c120a4f98b90f619070f306 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 30 Aug 2013 13:39:39 +1000 Subject: [PATCH] PX4: upload both v1 and v2 firmwares on firmware.diydrones.com --- Tools/scripts/build_binaries.sh | 38 ++++++--------------------------- 1 file changed, 6 insertions(+), 32 deletions(-) diff --git a/Tools/scripts/build_binaries.sh b/Tools/scripts/build_binaries.sh index f712902abd..f49fb75fa5 100755 --- a/Tools/scripts/build_binaries.sh +++ b/Tools/scripts/build_binaries.sh @@ -104,9 +104,8 @@ build_arduplane() { skip_build $tag $ddir || { make px4-clean && make px4 && - rsync ArduPlane.px4 px4fmu.px4 && - copyit px4fmu.px4 $ddir $tag && - copyit ArduPlane.px4 $ddir $tag + copyit ArduPlane-v1.px4 $ddir $tag && + copyit ArduPlane-v2.px4 $ddir $tag } } popd @@ -137,9 +136,8 @@ build_arducopter() { skip_build $tag $ddir && continue make px4-clean || continue make px4-$f || continue - rsync ArduCopter.px4 px4fmu.px4 && - copyit px4fmu.px4 $ddir $tag && - copyit ArduCopter.px4 $ddir $tag + copyit ArduCopter-v1.px4 $ddir $tag && + copyit ArduCopter-v2.px4 $ddir $tag done } popd @@ -167,43 +165,19 @@ build_rover() { skip_build $tag $ddir || { make px4-clean && make px4 && - rsync APMrover2.px4 px4fmu.px4 && - copyit px4fmu.px4 $ddir $tag && - copyit APMrover2.px4 $binaries/Rover/$hdate/PX4 $tag + copyit APMrover2-v1.px4 $binaries/Rover/$hdate/PX4 $tag && + copyit APMrover2-v2.px4 $binaries/Rover/$hdate/PX4 $tag } } popd git checkout master } -# build PX4io firmware -build_px4io() { - tag="$1" - test -n "$PX4_ROOT" && test -d "$PX4_ROOT" && { - echo "Building PX4IO $tag firmware" - pushd $PX4_ROOT - checkout PX4IO $tag || return - ddir=$binaries/PX4IO/$hdate/PX4IO - skip_build $tag $ddir || { - popd - pushd ArduPlane - make px4-clean && - make px4-io && - copyit px4io.bin $ddir $tag - popd - } - pushd $PX4_ROOT - git checkout master - popd - } -} - for build in stable beta latest; do build_arduplane $build build_arducopter $build build_rover $build done -build_px4io latest rm -rf $TMPDIR