Browse Source

Tools: rename APMrover2 to Rover

zr-v5.1
Peter Barker 5 years ago committed by Randy Mackay
parent
commit
2088446ebf
  1. 2
      Tools/autotest/logger_metadata/parse.py
  2. 2
      Tools/scripts/build_appveyor.sh
  3. 4
      Tools/scripts/build_binaries.py
  4. 2
      Tools/scripts/build_ci.sh
  5. 2
      Tools/scripts/build_parameters.sh

2
Tools/autotest/logger_metadata/parse.py

@ -31,7 +31,7 @@ re_vehicles = re.compile(r"\s*//\s*@Vehicles\s*:\s*(.*)")
class LoggerDocco(object): class LoggerDocco(object):
vehicle_map = { vehicle_map = {
"Rover": "APMrover2", "Rover": "Rover",
"Sub": "ArduSub", "Sub": "ArduSub",
"Copter": "ArduCopter", "Copter": "ArduCopter",
"Plane": "ArduPlane", "Plane": "ArduPlane",

2
Tools/scripts/build_appveyor.sh

@ -21,7 +21,7 @@ cd /cygdrive/c/work
/usr/bin/python waf -j4 copter plane rover heli sub /usr/bin/python waf -j4 copter plane rover heli sub
# map to the names that MissionPlanner expects # map to the names that MissionPlanner expects
cp /cygdrive/c/work/build/sitl/bin/ardurover.exe /cygdrive/c/work/sitl/APMrover2.elf cp /cygdrive/c/work/build/sitl/bin/ardurover.exe /cygdrive/c/work/sitl/Rover.elf
cp /cygdrive/c/work/build/sitl/bin/arduplane.exe /cygdrive/c/work/sitl/ArduPlane.elf cp /cygdrive/c/work/build/sitl/bin/arduplane.exe /cygdrive/c/work/sitl/ArduPlane.elf
cp /cygdrive/c/work/build/sitl/bin/arducopter.exe /cygdrive/c/work/sitl/ArduCopter.elf cp /cygdrive/c/work/build/sitl/bin/arducopter.exe /cygdrive/c/work/sitl/ArduCopter.elf
cp /cygdrive/c/work/build/sitl/bin/arducopter-heli.exe /cygdrive/c/work/sitl/ArduHeli.elf cp /cygdrive/c/work/build/sitl/bin/arducopter-heli.exe /cygdrive/c/work/sitl/ArduHeli.elf

4
Tools/scripts/build_binaries.py

@ -654,11 +654,11 @@ is bob we will attempt to checkout bob-AVR'''
'''build Rover binaries''' '''build Rover binaries'''
boards = self.common_boards() boards = self.common_boards()
self.build_vehicle(tag, self.build_vehicle(tag,
"APMrover2", "Rover",
boards, boards,
"Rover", "Rover",
"ardurover", "ardurover",
"APMrover2") "Rover")
def build_ardusub(self, tag): def build_ardusub(self, tag):
'''build Sub binaries''' '''build Sub binaries'''

2
Tools/scripts/build_ci.sh

@ -203,7 +203,7 @@ for t in $CI_BUILD_TARGET; do
fi fi
done done
python Tools/autotest/param_metadata/param_parse.py --vehicle APMrover2 python Tools/autotest/param_metadata/param_parse.py --vehicle Rover
python Tools/autotest/param_metadata/param_parse.py --vehicle AntennaTracker python Tools/autotest/param_metadata/param_parse.py --vehicle AntennaTracker
python Tools/autotest/param_metadata/param_parse.py --vehicle ArduCopter python Tools/autotest/param_metadata/param_parse.py --vehicle ArduCopter
python Tools/autotest/param_metadata/param_parse.py --vehicle ArduPlane python Tools/autotest/param_metadata/param_parse.py --vehicle ArduPlane

2
Tools/scripts/build_parameters.sh

@ -30,7 +30,7 @@ generate_parameters ArduPlane
generate_parameters ArduCopter generate_parameters ArduCopter
generate_parameters APMrover2 generate_parameters Rover
generate_parameters ArduSub generate_parameters ArduSub

Loading…
Cancel
Save