ros tests: add an interactive flag & disable the PX4 shell for ROS tests (#9672)

This commit is contained in:
Beat Küng
2018-06-14 12:37:47 -04:00
committed by Daniel Agar
parent 753ad0e0df
commit b66f0f36a5
8 changed files with 23 additions and 2 deletions
+2
View File
@@ -4,12 +4,14 @@
<!-- Test a mission -->
<arg name="est" default="ekf2"/>
<arg name="gui" default="false"/>
<arg name="interactive" default="false"/>
<arg name="vehicle" default="iris"/>
<arg name="mission"/>
<!-- MAVROS, PX4 SITL, Gazebo -->
<include file="$(find px4)/launch/mavros_posix_sitl.launch">
<arg name="est" value="$(arg est)"/>
<arg name="gui" value="$(arg gui)"/>
<arg name="interactive" value="$(arg interactive)"/>
<arg name="vehicle" value="$(arg vehicle)"/>
<arg name="respawn_gazebo" value="true"/>
<arg name="respawn_mavros" value="true"/>
@@ -4,10 +4,12 @@
<!-- Test offboard local posistion and attitude control with optical flow iris -->
<arg name="est" default="ekf2"/>
<arg name="gui" default="false"/>
<arg name="interactive" default="false"/>
<!-- MAVROS, PX4 SITL, Gazebo -->
<include file="$(find px4)/launch/mavros_posix_sitl.launch">
<arg name="est" value="$(arg est)"/>
<arg name="gui" value="$(arg gui)"/>
<arg name="interactive" value="$(arg interactive)"/>
<arg name="vehicle" value="iris_opt_flow"/>
<arg name="respawn_gazebo" value="true"/>
<arg name="respawn_mavros" value="true"/>
+2
View File
@@ -5,10 +5,12 @@
<arg name="est" default="ekf2"/>
<arg name="gui" default="false"/>
<arg name="vehicle" default="standard_vtol"/>
<arg name="interactive" default="false"/>
<!-- MAVROS, PX4 SITL, Gazebo -->
<include file="$(find px4)/launch/mavros_posix_sitl.launch">
<arg name="est" value="$(arg est)"/>
<arg name="gui" value="$(arg gui)"/>
<arg name="interactive" value="$(arg interactive)"/>
<arg name="vehicle" value="$(arg vehicle)"/>
<arg name="respawn_gazebo" value="true"/>
<arg name="respawn_mavros" value="true"/>
@@ -5,10 +5,12 @@
<arg name="est" default="ekf2"/>
<arg name="gui" default="false"/>
<arg name="vehicle" default="iris"/>
<arg name="interactive" default="false"/>
<!-- MAVROS, PX4 SITL, Gazebo -->
<include file="$(find px4)/launch/mavros_posix_sitl.launch">
<arg name="est" value="$(arg est)"/>
<arg name="gui" value="$(arg gui)"/>
<arg name="interactive" value="$(arg interactive)"/>
<arg name="vehicle" value="$(arg vehicle)"/>
<arg name="respawn_gazebo" value="true"/>
<arg name="respawn_mavros" value="true"/>
@@ -5,10 +5,12 @@
<arg name="est" default="ekf2"/>
<arg name="gui" default="false"/>
<arg name="vehicle" default="iris"/>
<arg name="interactive" default="false"/>
<!-- MAVROS, PX4 SITL, Gazebo -->
<include file="$(find px4)/launch/mavros_posix_sitl.launch">
<arg name="est" value="$(arg est)"/>
<arg name="gui" value="$(arg gui)"/>
<arg name="interactive" value="$(arg interactive)"/>
<arg name="vehicle" value="$(arg vehicle)"/>
<arg name="respawn_gazebo" value="true"/>
<arg name="respawn_mavros" value="true"/>