Browse Source

Tools: fixed ardusub build

and manifest generation without PX4IO
master
Andrew Tridgell 8 years ago
parent
commit
4c6922e413
  1. 2
      Tools/scripts/build_binaries.sh
  2. 3
      Tools/scripts/generate-manifest.py

2
Tools/scripts/build_binaries.sh

@ -494,7 +494,7 @@ build_ardusub() {
error_count=$((error_count+1)) error_count=$((error_count+1))
continue continue
} }
cp -f $BUILDROOT/px4-$v/bin/ArduSub.px4 ArduSub-$v.px4 || { cp -f $BUILDROOT/px4-$v/bin/ardusub.px4 ArduSub-$v.px4 || {
echo "Failed build copy of ArduSub PX4 $tag for $v" echo "Failed build copy of ArduSub PX4 $tag for $v"
error_count=$((error_count+1)) error_count=$((error_count+1))
continue continue

3
Tools/scripts/generate-manifest.py

@ -45,7 +45,6 @@ class ManifestGenerator():
"Plane": "FIXED_WING", "Plane": "FIXED_WING",
"AntennaTracker": "ANTENNA_TRACKER", "AntennaTracker": "ANTENNA_TRACKER",
"Rover": "GROUND_ROVER", "Rover": "GROUND_ROVER",
"PX4IO": "ARDUPILOT_PX4IO",
"Sub": "SUBMARINE" "Sub": "SUBMARINE"
} }
if frame in frame_to_mavlink_dict: if frame in frame_to_mavlink_dict:
@ -202,7 +201,7 @@ class ManifestGenerator():
xfirmwares = dict() xfirmwares = dict()
# used to listdir basedir here, but since this is also a web document root, there's a lot of other stuff accumulated... # used to listdir basedir here, but since this is also a web document root, there's a lot of other stuff accumulated...
vehicletypes = [ 'AntennaTracker', 'Copter', 'Plane', 'PX4IO', 'Rover', 'Sub' ] vehicletypes = [ 'AntennaTracker', 'Copter', 'Plane', 'Rover', 'Sub' ]
for vehicletype in vehicletypes: for vehicletype in vehicletypes:
vdir = os.listdir(os.path.join(basedir, vehicletype)) vdir = os.listdir(os.path.join(basedir, vehicletype))
for firstlevel in vdir: for firstlevel in vdir:

Loading…
Cancel
Save