diff --git a/Tools/gazebo_sitl_multiple_run.sh b/Tools/gazebo_sitl_multiple_run.sh index 38b6e5a5bb..14a189fe5c 100755 --- a/Tools/gazebo_sitl_multiple_run.sh +++ b/Tools/gazebo_sitl_multiple_run.sh @@ -31,7 +31,7 @@ function spawn_model() { pushd "$working_dir" &>/dev/null echo "starting instance $N in $(pwd)" ../bin/px4 -i $N -d "$build_path/etc" -w sitl_${MODEL}_${N} -s etc/init.d-posix/rcS >out.log 2>err.log & - python3 ${src_path}/Tools/sitl_gazebo/scripts/jinja_gen.py ${src_path}/Tools/sitl_gazebo/models/${MODEL}/${MODEL}.sdf.jinja ${src_path}/Tools/sitl_gazebo --mavlink_tcp_port $((4560+${N})) --mavlink_udp_port $((14560+${N})) --output-file /tmp/${MODEL}_${N}.sdf + python3 ${src_path}/Tools/sitl_gazebo/scripts/jinja_gen.py ${src_path}/Tools/sitl_gazebo/models/${MODEL}/${MODEL}.sdf.jinja ${src_path}/Tools/sitl_gazebo --mavlink_tcp_port $((4560+${N})) --mavlink_udp_port $((14560+${N})) --mavlink_id $((1+${N})) --gst_udp_port $((5600+${N})) --video_uri $((5600+${N})) --mavlink_cam_udp_port $((14530+${N})) --output-file /tmp/${MODEL}_${N}.sdf echo "Spawning ${MODEL}_${N}" diff --git a/launch/multi_uav_mavros_sitl.launch b/launch/multi_uav_mavros_sitl.launch index 7cb06880a8..c699d72ea6 100644 --- a/launch/multi_uav_mavros_sitl.launch +++ b/launch/multi_uav_mavros_sitl.launch @@ -36,6 +36,9 @@ + + + @@ -62,6 +65,9 @@ + + + @@ -88,6 +94,9 @@ + + + diff --git a/launch/single_vehicle_spawn.launch b/launch/single_vehicle_spawn.launch index ad9d9b5436..b62b89cd8a 100644 --- a/launch/single_vehicle_spawn.launch +++ b/launch/single_vehicle_spawn.launch @@ -17,10 +17,13 @@ + + + - +