dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Fix roslaunch multivehicle regression caused by #16497

This commit is contained in:
Jaeyoung-Lim 2021-01-12 14:41:41 +01:00 committed by JaeyoungLim
parent daaf8b61dc
commit 16b1b220fd
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
launch/single_vehicle_spawn.launch
View File

@ -20,10 +20,11 @@
<arg name="gst_udp_port" default="5600"/> <arg name="gst_udp_port" default="5600"/>
<arg name="video_uri" default="5600"/> <arg name="video_uri" default="5600"/>
<arg name="mavlink_cam_udp_port" default="14530"/> <arg name="mavlink_cam_udp_port" default="14530"/>
<arg name="mavlink_id" value="$(eval 1 + arg('ID'))" />
<!-- PX4 configs --> <!-- PX4 configs -->
<arg name="interactive" default="true"/> <arg name="interactive" default="true"/>
<!-- generate sdf vehicle model --> <!-- generate sdf vehicle model -->
<arg name="cmd" default="$(find mavlink_sitl_gazebo)/scripts/jinja_gen.py --stdout --mavlink_id=$(eval 1 + arg('ID')) --mavlink_udp_port=$(arg mavlink_udp_port) --mavlink_tcp_port=$(arg mavlink_tcp_port) --gst_udp_port=$(arg gst_udp_port) --video_uri=$(arg video_uri) --mavlink_cam_udp_port=$(arg mavlink_cam_udp_port) $(find mavlink_sitl_gazebo)/models/$(arg vehicle)/$(arg vehicle).sdf.jinja $(find mavlink_sitl_gazebo)"/> <arg name="cmd" default="$(find mavlink_sitl_gazebo)/scripts/jinja_gen.py --stdout --mavlink_id=$(arg mavlink_id) --mavlink_udp_port=$(arg mavlink_udp_port) --mavlink_tcp_port=$(arg mavlink_tcp_port) --gst_udp_port=$(arg gst_udp_port) --video_uri=$(arg video_uri) --mavlink_cam_udp_port=$(arg mavlink_cam_udp_port) $(find mavlink_sitl_gazebo)/models/$(arg vehicle)/$(arg vehicle).sdf.jinja $(find mavlink_sitl_gazebo)"/>
<param command="$(arg cmd)" name="sdf_$(arg vehicle)$(arg ID)"/> <param command="$(arg cmd)" name="sdf_$(arg vehicle)$(arg ID)"/>
<!-- PX4 SITL --> <!-- PX4 SITL -->
<arg unless="$(arg interactive)" name="px4_command_arg1" value=""/> <arg unless="$(arg interactive)" name="px4_command_arg1" value=""/>