Commit Graph

205 Commits

Author SHA1 Message Date
Peter Barker 8f15a76327 Tools: autotest: sim_vehicle.py: whitespace changes for flake8 compliance 2018-07-04 09:36:48 +10:00
Michael du Breuil 7e7bbb8df6 Tools: sim_vehicle.py fixups
limit pkill to 15 characters, fix GDB arguments for python3
2018-07-04 09:36:48 +10:00
Andrew Tridgell b527dce08d autotest: use --enable-sfml for graphics 2018-07-02 10:43:48 +10:00
Andrew Tridgell 00b2cc4a93 Tools: support --osd option to sim_vehicle.py 2018-07-01 21:21:28 +10:00
Peter Barker 7cdb05ccc0 Tools: add default-parameter-filename sanity check 2018-06-21 19:32:46 +10:00
Jesse Millwood 014702fc64 Changed Argument Parsing for sim_vehicle.py
The arguments now properly pare the arguments passed through to the
ardupilot instance and to mavproxy.
2018-05-23 17:34:24 +10:00
Andrew Tridgell 3b143a99bf autotest: removed sitl-debug varient 2018-05-04 18:33:53 +10:00
Andrew Tridgell 9e76555152 autotest: added --no-extra-ports option for sim_vehicle.py 2018-05-02 19:24:20 +10:00
Pierre Kancir a43183ec14 Tools: sim_vehicle.py: Allow to pass custom param file 2018-04-26 22:40:49 +01:00
Peter Barker 15450b956d Tools: sim_vehicle.py: make --tracker work again 2018-03-21 11:46:47 +11:00
Peter Barker 5fbb385c31 Tools: autotest: avoid exception when using Python3 on MacOSX
File "./Tools/autotest/sim_vehicle.py", line 999, in <module>
location)
File "./Tools/autotest/sim_vehicle.py", line 573, in start_vehicle
run_in_terminal_window(autotest, cmd_name, cmd)
File "./Tools/autotest/sim_vehicle.py", line 476, in
run_in_terminal_window
tabs = p.findall(out)
TypeError: cannot use a string pattern on a bytes-like object
SIM_VEHICLE: Killing tasks
2018-03-19 12:36:55 +11:00
Siddharth Purohit 8f074d52c1 autotest: fix setup of sitl for macosx 2018-01-31 12:22:23 +11:00
Peter Barker 8a15c69aff Tools: add --fresh-params option to sim_vehicle.py
This will rebuild and use the XML file we generate from our
source code which conveys information about our parameters.

When using this option, "param help PARAMETERNAME" should reflect
changes made to the parameter metadata for PARAMETERNAME.
2018-01-08 14:49:35 +00:00
Guglie 42e5b180cb Tools: fix sim_vehicle.py terminal tab when using --no-mavproxy 2017-12-02 09:34:10 +11:00
guglie e741cb28d2 fix wait_unlimited with an infinite sleep loop
this fixes issue #7180
2017-11-06 13:39:59 +11:00
Peter Barker 93810ab42a Tools: sim_vehicle.py: clarify comment about vagrant and mavlink-out 2017-10-26 15:03:58 +11:00
Peter Barker 89fa44a224 Tools: sim_vehicle.py: flake8 compliance 2017-10-26 15:03:58 +11:00
Peter Barker e505635ddd Tools: sim_vehicle: make gdb-stopped work again 2017-09-11 12:30:00 +10:00
Francisco Ferreira 2645760d19
Tools: sim_vehicle.py: fix small bug introduced in e298e87
Thanks to @cclauss for finding this
2017-08-29 12:16:23 +01:00
Peter Barker e298e87791 sim_vehicle: add --callgrind option 2017-08-28 13:47:27 +01:00
Peter Barker 86d8252166 Tools: correct sim_vehicle's --tracker option 2017-07-07 16:18:37 +01:00
Peter Barker 3a9ac2ef40 Tools: pull out vehicle metadata into a library 2017-05-26 16:53:07 +09:00
Pierre Kancir 971c8d5948 Tools: use parm inheritance for gazebo iris model 2017-05-25 10:02:32 +10:00
Peter Barker d1fb2e7c53 Tools: use parm inheritance for copter models 2017-05-25 09:58:53 +10:00
Miguel Arroyo d9546523a3 Tools: sim_vehicle.py fix for Python 3 2017-05-17 11:15:34 +10:00
Andrew Tridgell 4240d3f739 Autotest: support tilttri-vec quadplane 2017-04-24 16:54:41 +10:00
Guilherme Sousa 442715ab1b autotest: Added new frame parameters for hexa, octa and octa-quad options 2017-03-29 22:43:14 +11:00
Andrew Tridgell 8387e1e69c autotest: added parameters for heli-dual model 2017-03-25 16:22:10 +11:00
Pierre Kancir fb79c96448 sim_vehicle.py: add gazebo rover 2017-03-18 19:58:11 +11:00
Peter Barker 3f7d58fe2c sim_vehicle.py: allow a list of defaults files to be specified 2017-02-23 22:46:33 -08:00
Peter Barker 64d4e094fb Tools: sim_vehicle.py: correct formatting (NFC) 2017-02-23 11:07:37 +11:00
Peter Barker b256bc1dc0 Tools: sim_vehicle.py: add a warning when frame not found
We don't always have configuration for a frame type, but
it is atypical to run sim_vehicle like that.
2017-02-23 11:07:37 +11:00
Peter Barker 3be8c1e70b Tools: sim_vehicle.py: move metadata into _options
This centralises configuration information in _options and
removes duplication of data
2017-02-23 11:07:35 +11:00
Peter Barker fec23f6abe Tools: sim_vehicle.py: print possible frame types in help message 2017-02-23 11:07:05 +11:00
Peter Barker dd9de7dfb5 Tools: sim_vehicle.py: improve help about vehicle types 2017-02-23 11:06:28 +11:00
Peter Barker aec7091faa autotest: Add support for Sub in sim_vehicle.py 2017-02-21 11:26:14 +11:00
Andrew Tridgell 94fb390bda autotest: added sim_vehicle.py support for tailsitter 2017-02-18 17:26:43 +11:00
Pierre Kancir 38b6ced640 Tools: sim_vehicle add option to disable mavproxy launch && better exit handling 2017-02-06 11:35:54 +01:00
Andrew Tridgell 2bb3d395cf autotest: setup for firefly6 quadplane parameters 2017-02-06 16:18:58 +11:00
Pierre Kancir a6c82a0919 SITL: add an option to launch SITL from a directory 2017-02-02 04:26:37 +00:00
Andrew Tridgell 715db62a85 autotest: added quadplane-cl84 support 2017-01-25 19:01:15 +11:00
Andrew Tridgell a56090113c autotest: fixed sim_vehicle.py with -f heli 2017-01-12 17:39:37 +11:00
Andrew Tridgell 8504a8baad autotest: fixed sim_vehicle for new frame builds 2017-01-12 17:39:37 +11:00
Randy Mackay 9d315b0829 Tools: sim_vehicle spelling correction 2017-01-09 20:40:59 +09:00
Daniel Schonfeld ef637e4add a better way to determine if were running inside a vagrant box 2016-12-29 10:46:29 +11:00
Andrew Tridgell a191792e4b autotest: added octa-quad sim_vehicle.py option
this was missed in conversion from sim_vehicle.sh
2016-11-30 08:02:03 +11:00
Lars Kellogg-Stedman 95134d87b0 add support for a user locations.txt file to sim_vehicle
it is inconvenient to modify locations.txt in the source, because this
will lead to the file being constantly marked as modified by git (and
potentially included in pull requests by accident).

this commit adds support for a user-maintained list of locations.
This file lives by default in
`$XDG_CONFIG_DIR/ardupilot/locations.txt` (aka
`$HOME/.config/ardupilot/locations.txt`), but may also be specified in
the `ARDUPILOT_LOCATIONS` environment variable.
2016-11-15 19:42:54 +11:00
Peter Barker cd67c4c75c Tools: sim_vehicle.py strips comments in locations.txt 2016-11-15 13:52:59 +11:00
Pierre Kancir 4462dcdd4d sim_vehicle.py: add python3 support 2016-11-09 11:48:22 -03:00
Andrew Tridgell d967074183 autotest: disable rebuild-on-failure by default
the waf build has much better dependencies, so on balance this is more
annoying than useful now
2016-10-19 09:58:54 +11:00
John Hsu 4c14707611 SITL: set simulation names gazebo-iris and gazebo-zephyr in sim_vehicles.py 2016-10-13 12:03:20 +11:00
John Hsu 7cae83581b SITL: add Gazebo SITL params for Iris with IRLocak tracking, Zephyr elevon flying wing model, and update sim_vehicles.py with GazeboIris and GazeboZephyr labels. 2016-10-13 12:03:20 +11:00
Fnoop 2c0b687b9d Tools: Make default udpout ports scale by instance in sim_vehicle.py 2016-10-09 21:49:45 +11:00
Peter Barker 909f7779c7 Tools: rearrange sim_vehicle.py to put all functions first 2016-09-19 09:13:53 +10:00
Peter Barker 074e9dc9b0 Tools: special --aircraft mavproxy pass-through for sim-vehicle.py 2016-09-09 17:36:37 +10:00
Lucas De Marchi f5be0823f9 sim_vehicle.py: move exit handler and start message
Move them after the argument parser because otherwise they would display
and the handler be registered when using the 'help' option.
2016-09-09 15:50:52 +10:00
Lucas De Marchi 0a75e2f12a sim_vehicle.py: fix indent on epilog 2016-09-09 15:50:52 +10:00
Pierre Kancir 9e1ffcae5d Tools: update python coding style
Tools: update PrintVersion.py coding style

autotest: update python coding style

pysim: update python coding style

jsb_sim: update Python coding style

param_metadata: update Python coding style
2016-09-01 13:05:11 +10:00
Peter Barker 198a7d7710 sim_vehicle.py: add arguments to pass args to waf build and configure 2016-08-31 11:04:40 +10:00
Peter Barker 569a7a4abd Tools: sim_vehicle.py - correct process termination
Closes #4699
2016-08-22 15:38:50 +10:00
Peter Barker 25136ea15a Tools: correct tracker build 2016-08-17 08:33:53 +10:00
Lucas De Marchi f0590581e4 autotest: standardize name of param files
Try to make the various param files to follow similar namings:

    - Lowercase the few ones using uppercase
    - Use dash to separate name components
    - Start with "copter", "plane", "rover", etc instead of the mix we
      had
    - Remove "params" from the filename since it's redundant with the
      extension
2016-08-08 10:12:14 -03:00
Pierre Kancir 19d94737a0 autotest: move all default params to default_params directory 2016-08-03 17:44:37 -03:00
Pierre Kancir ff8c772776 sim_vehicle.py: correct url 2016-07-28 16:44:18 -03:00
Pierre Kancir 40a594e137 sim_vehicle.py : style correction 2016-07-28 16:44:18 -03:00
Andrew Tridgell 1a3b292aa3 autotest: fixed run_in_terminal_window() on Linux
try to retain MacOS functionality too
2016-07-08 08:20:20 +10:00
Lucas De Marchi e2498a1090 autotest: add function to kill tasks on MacOS
Like done on other cases, add an explicit function for that, which turns
the comment redundant.
2016-07-07 11:35:18 -03:00
Siddharth Bharat Purohit 4f0dad19ea autotest: support mac osx terminal launch 2016-07-07 11:35:17 -03:00
Andrew Tridgell d477905fbd autotest: fixed XPlane with sim_vehicle.py 2016-06-30 20:26:14 +10:00
Andrew Tridgell 0f7b4a0cd1 autotest: fixed tricopter quadplane for sim_vehicle.py 2016-06-30 14:16:52 +10:00
Andrew Tridgell a8e5255b90 autotest: look in parent directories for vehicle type in sim_vehicle.py
this allows eeprom.bin per vehicle type without using -v
2016-06-24 11:28:18 +10:00
Peter Barker febba9112f sim_vehicle.py: simply ignore any failure to kill tasks 2016-06-23 18:39:09 -03:00
Peter Barker 2266223665 sim_vehicle.py: shell out to pkill if psutil is not available 2016-06-23 18:39:09 -03:00
Peter Barker d9ad962b33 sim_vehicle.py: allow starting mavproxy without --sitl option 2016-06-22 21:25:11 +10:00
Peter Barker 51020387c8 sim_vehicle.py: allow model to be overridden on command line 2016-06-22 21:25:11 +10:00
Peter Barker 53df307c2d sim_vehicle.py: older python has no accessors for proc.status 2016-06-06 12:27:41 +10:00
Peter Barker 91e72de302 sim_vehicle.py: remove unused parameter 2016-06-06 12:27:29 +10:00
Andrew Tridgell b76a993f7e autotest: support coaxcopter 2016-05-26 17:09:31 +10:00
Andrew Tridgell ba3703303a autotest: added SingleCopter 2016-05-26 16:37:58 +10:00
Peter Barker 0c70f0fc35 sim_vehicle.py: correct rebase 2016-05-24 21:02:36 +10:00
khancyr c9e877b3a5 sim_vehicle.py : reorder frame by type 2016-05-24 19:54:12 +10:00
khancyr 25066be990 sim_vehicle.py : add hexacopter 2016-05-24 19:53:36 +10:00
Grant Morphett d993c25cb1 Rover: Added skid steering rover as frame type for SITL. 2016-05-24 12:24:53 +10:00
Gustavo Jose de Sousa 91e7f02d9d Tools: sim_vehicle: add calibration frame
The module `sitl_calibration` is loaded for convenience.
2016-05-18 13:28:52 -03:00
Gustavo Jose de Sousa 41f5602fea Tools: sim_vehicle: add local mavproxy modules path to PYTHONPATH
That's helpful for users that don't have that in their PYTHONPATH environment
variable and want to load a local module.
2016-05-18 13:28:52 -03:00
Gustavo Jose de Sousa ede0360ee1 Tools: sim_vehicle: allow passing keywords to run_cmd_blocking
That is redirected to subprocess.Popen().
2016-05-18 13:28:52 -03:00
Peter Barker 18e0131680 sim_vehicle.py: avoid requesting process name on zombie process
This method does on OSX - in a non-catchable way prior to Py3
2016-05-16 17:18:32 +10:00
Peter Barker 38010cf3f3 sim_vehicle.py: wrap jsbsim version fetch in a try 2016-05-16 11:58:53 +10:00
Ricardo de Almeida Gonzaga 1062aed91e Tools: Fix typos 2016-05-13 19:20:07 -03:00
khancyr 14e2fa5642 sim_vehicle.py : load Rover default params
related to https://github.com/ArduPilot/ardupilot/issues/4090
2016-05-13 08:53:53 +10:00
Peter Barker f33cdaa212 sim_vehicle.py: add --strace option 2016-05-13 08:43:08 +10:00
Lucas De Marchi b012d5bb7b sim_vehicle.py: fix error to find binary
When trying to execute sim_vehicle.py this is the current output:

Warning: Could not find '../Tools/autotest/../../ArduCopter/../build/sitl/bin/arducopter-quad',
	starting '/bin/bash' instead.  Please check your profile settings.

Fix the path to the binary and use absolute paths to ease the debug.
2016-05-12 00:34:02 -03:00
Lucas De Marchi ad8cedc452 sim_vehicle.py: remove unused AUTOTEST variable 2016-05-12 00:31:37 -03:00
Lucas De Marchi e772c70536 sim_vehicle.py: use helper function to execute blocking command 2016-05-12 00:31:07 -03:00
Lucas De Marchi 1ef9eb637f sim_vehicle.py: configure project only once 2016-05-11 23:44:24 -03:00
Lucas De Marchi 7a548e45f9 sim_vehicle.py: default to -j1 if running in compat mode 2016-05-11 23:34:49 -03:00
Pierre Kancir 03e565ee47 sim_vehicle.py : change default number of jobs
By default waf use the max num of proc available. So let it set jobs by
itself. On contrary, with make only use one job by default.
2016-05-11 22:55:30 -03:00
khancyr bb648280ae sim_vehicle.py: correct APMrover2 typo 2016-05-11 09:43:06 +02:00
Peter Barker b7d1e047aa sim_vehicle.py: correct binary to use for --debug 2016-05-11 16:37:34 +10:00
Andrew Tridgell b3cb83731c autotest: added quadplane-tilttri model 2016-05-11 05:55:24 +10:00
Peter Barker 5d24f0de23 sim_vehicle: use waf --debug option to create debug builds 2016-05-09 08:59:59 +10:00
Peter Barker 50330e22d4 sim_vehicle.py: set default_waf_target, clearer help
sim_vehicle.py: choose default waf_target based on specified vehicle

sim_vehicle.py: add --no-rebuild-on-failure option

sim_vehicle.py: make help clearer by adding option groups
2016-05-08 09:57:11 +10:00
Peter Barker 39c29820c4 sim_vehicle.py: avoid exception when frame information not found 2016-05-08 00:31:23 +10:00
Peter Barker 75c965f512 sim_vehicle.py: interface improvements based on feedback; waf support
sim_vehicle.py: improve output of executed commands

Emit something that could be copy-and-pasted into a shell

sim_vehicle.py: allow specification of multiple gdb breakpoints

sim_vehicle.py: understand some specific mavproxy options

sim_vehicle.py: validate vehicle, throw warning if it looks suspect

sim_vehicle.py: avoid use of psutil (cygwin not supported)

sim_vehicle.py: rename build_target to make_target

sim_vehicle.py: pass vehicle binary to start_vehicle

sim_vehicle.py: waf build system support

sim_vehicle.py: use waf by default
2016-05-05 10:59:08 +10:00
Peter Barker a9940a8ca5 sim_vehicle.py: create from sim_vehicle.sh 2016-04-29 10:29:43 +10:00