From 15835ce7a3b3213df4a83a6a292a07ddf3de79c2 Mon Sep 17 00:00:00 2001 From: JaeyoungLim Date: Sun, 19 Jan 2020 22:49:46 +0100 Subject: [PATCH] Add standard_vtol as supported model for multivehicle sim gazebo Fix --- Tools/gazebo_sitl_multiple_run.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tools/gazebo_sitl_multiple_run.sh b/Tools/gazebo_sitl_multiple_run.sh index 48d616a925..2f1b99fbe3 100755 --- a/Tools/gazebo_sitl_multiple_run.sh +++ b/Tools/gazebo_sitl_multiple_run.sh @@ -29,9 +29,9 @@ done num_vehicles=${NUM_VEHICLES:=3} export PX4_SIM_MODEL=${VEHICLE_MODEL:=iris} -if [ "$PX4_SIM_MODEL" != "iris" ] & [ "$PX4_SIM_MODEL" != "plane" ] +if [ "$PX4_SIM_MODEL" != "iris" ] && [ "$PX4_SIM_MODEL" != "plane" ] && [ "$PX4_SIM_MODEL" != "standard_vtol" ] then - echo "Currently only iris and plane vehicle model is supported!" + echo "Currently only the following vehicle models are supported! [iris, plane, standard_vtol]" exit 1 fi @@ -69,7 +69,7 @@ while [ $n -lt $num_vehicles ]; do gz sdf -p /tmp/${PX4_SIM_MODEL}_${n}.urdf > /tmp/${PX4_SIM_MODEL}_${n}.sdf echo "Spawning ${PX4_SIM_MODEL}_${n}" - gz model --spawn-file=/tmp/${PX4_SIM_MODEL}_${n}.sdf --model-name=${PX4_SIM_MODEL}_${n} -x 0.0 -y $((2*${n})) -z 0.0 + gz model --spawn-file=/tmp/${PX4_SIM_MODEL}_${n}.sdf --model-name=${PX4_SIM_MODEL}_${n} -x 0.0 -y $((3*${n})) -z 0.0 popd &>/dev/null