From a8e5255b904a766fc618e591322fc75684ad61b6 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 24 Jun 2016 10:48:24 +1000 Subject: [PATCH] autotest: look in parent directories for vehicle type in sim_vehicle.py this allows eeprom.bin per vehicle type without using -v --- Tools/autotest/sim_vehicle.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Tools/autotest/sim_vehicle.py b/Tools/autotest/sim_vehicle.py index 32d0334937..24d9c58be5 100755 --- a/Tools/autotest/sim_vehicle.py +++ b/Tools/autotest/sim_vehicle.py @@ -277,6 +277,18 @@ default_frame_for_vehicle = { "AntennaTracker": "tracker" } +if not default_frame_for_vehicle.has_key(opts.vehicle): + # try in parent directories, useful for having config in subdirectories + cwd = os.getcwd() + while cwd: + bname = os.path.basename(cwd) + if not bname: + break + if bname in default_frame_for_vehicle: + opts.vehicle = bname + break + cwd = os.path.dirname(cwd) + # try to validate vehicle if not default_frame_for_vehicle.has_key(opts.vehicle): progress("** Is (%s) really your vehicle type? Try -v VEHICLETYPE if not, or be in the e.g. ArduCopter subdirectory" % (opts.vehicle,))