diff options
author | Andreas Daniel Antener <antener_a@gmx.ch> | 2015-02-19 22:11:25 +0100 |
---|---|---|
committer | Andreas Daniel Antener <antener_a@gmx.ch> | 2015-02-19 22:11:25 +0100 |
commit | 80d14e80bb2c3b0930c920a45480958f993c8733 (patch) | |
tree | 818b26e53c23ea2926c98a7a402fb85f1a0695b9 | |
parent | 38b669b01d92096054d109359b82bf0bf8616068 (diff) | |
parent | e8f66ccf843809e5ef7f8d049a6d0d8c2ef4c062 (diff) | |
download | px4-firmware-80d14e80bb2c3b0930c920a45480958f993c8733.tar.gz px4-firmware-80d14e80bb2c3b0930c920a45480958f993c8733.tar.bz2 px4-firmware-80d14e80bb2c3b0930c920a45480958f993c8733.zip |
Merge pull request #1813 from UAVenture/ros-expose-arguments
Use new arguments for euroc launch files
-rw-r--r-- | launch/gazebo_ardrone_empty_world.launch | 16 | ||||
-rw-r--r-- | launch/gazebo_ardrone_house_world.launch | 16 | ||||
-rw-r--r-- | launch/gazebo_iris_empty_world.launch | 16 | ||||
-rw-r--r-- | launch/gazebo_iris_house_world.launch | 16 | ||||
-rw-r--r-- | launch/gazebo_iris_outdoor_world.launch | 16 |
5 files changed, 70 insertions, 10 deletions
diff --git a/launch/gazebo_ardrone_empty_world.launch b/launch/gazebo_ardrone_empty_world.launch index d04991f19..9d19fe5f9 100644 --- a/launch/gazebo_ardrone_empty_world.launch +++ b/launch/gazebo_ardrone_empty_world.launch @@ -1,6 +1,18 @@ <launch> -<include file="$(find rotors_gazebo)/launch/ardrone_empty_world_with_joy.launch" /> -<include file="$(find px4)/launch/ardrone.launch" /> + <arg name="headless" default="false"/> + <arg name="gui" default="true"/> + <arg name="enable_logging" default="false"/> + <arg name="enable_ground_truth" default="true"/> + <arg name="log_file" default="ardrone"/> + + <include file="$(find rotors_gazebo)/launch/ardrone_empty_world_with_joy.launch"> + <arg name="headless" value="$(arg headless)"/> + <arg name="gui" value="$(arg gui)"/> + <arg name="enable_logging" value="$(arg enable_logging)" /> + <arg name="enable_ground_truth" value="$(arg enable_ground_truth)" /> + <arg name="log_file" value="$(arg log_file)"/> + </include> + <include file="$(find px4)/launch/ardrone.launch" /> </launch> diff --git a/launch/gazebo_ardrone_house_world.launch b/launch/gazebo_ardrone_house_world.launch index d1bb2043a..c636868eb 100644 --- a/launch/gazebo_ardrone_house_world.launch +++ b/launch/gazebo_ardrone_house_world.launch @@ -1,6 +1,18 @@ <launch> -<include file="$(find rotors_gazebo)/launch/ardrone_house_world_with_joy.launch" /> -<include file="$(find px4)/launch/ardrone.launch" /> + <arg name="headless" default="false"/> + <arg name="gui" default="true"/> + <arg name="enable_logging" default="false"/> + <arg name="enable_ground_truth" default="true"/> + <arg name="log_file" default="ardrone"/> + + <include file="$(find rotors_gazebo)/launch/ardrone_house_world_with_joy.launch"> + <arg name="headless" value="$(arg headless)"/> + <arg name="gui" value="$(arg gui)"/> + <arg name="enable_logging" value="$(arg enable_logging)" /> + <arg name="enable_ground_truth" value="$(arg enable_ground_truth)" /> + <arg name="log_file" value="$(arg log_file)"/> + </include> + <include file="$(find px4)/launch/ardrone.launch" /> </launch> diff --git a/launch/gazebo_iris_empty_world.launch b/launch/gazebo_iris_empty_world.launch index d69b7d006..8a4c128b9 100644 --- a/launch/gazebo_iris_empty_world.launch +++ b/launch/gazebo_iris_empty_world.launch @@ -1,6 +1,18 @@ <launch> -<include file="$(find rotors_gazebo)/launch/iris_empty_world_with_joy.launch" /> -<include file="$(find px4)/launch/iris.launch" /> + <arg name="headless" default="false"/> + <arg name="gui" default="true"/> + <arg name="enable_logging" default="false"/> + <arg name="enable_ground_truth" default="true"/> + <arg name="log_file" default="iris"/> + + <include file="$(find rotors_gazebo)/launch/iris_empty_world_with_joy.launch"> + <arg name="headless" value="$(arg headless)"/> + <arg name="gui" value="$(arg gui)"/> + <arg name="enable_logging" value="$(arg enable_logging)" /> + <arg name="enable_ground_truth" value="$(arg enable_ground_truth)" /> + <arg name="log_file" value="$(arg log_file)"/> + </include> + <include file="$(find px4)/launch/iris.launch" /> </launch> diff --git a/launch/gazebo_iris_house_world.launch b/launch/gazebo_iris_house_world.launch index 2e88e157c..e4f9f6532 100644 --- a/launch/gazebo_iris_house_world.launch +++ b/launch/gazebo_iris_house_world.launch @@ -1,6 +1,18 @@ <launch> -<include file="$(find rotors_gazebo)/launch/iris_house_world_with_joy.launch" /> -<include file="$(find px4)/launch/iris.launch" /> + <arg name="headless" default="false"/> + <arg name="gui" default="true"/> + <arg name="enable_logging" default="false"/> + <arg name="enable_ground_truth" default="true"/> + <arg name="log_file" default="iris"/> + + <include file="$(find rotors_gazebo)/launch/iris_house_world_with_joy.launch"> + <arg name="headless" value="$(arg headless)"/> + <arg name="gui" value="$(arg gui)"/> + <arg name="enable_logging" value="$(arg enable_logging)" /> + <arg name="enable_ground_truth" value="$(arg enable_ground_truth)" /> + <arg name="log_file" value="$(arg log_file)"/> + </include> + <include file="$(find px4)/launch/iris.launch" /> </launch> diff --git a/launch/gazebo_iris_outdoor_world.launch b/launch/gazebo_iris_outdoor_world.launch index a1df06496..22d55502d 100644 --- a/launch/gazebo_iris_outdoor_world.launch +++ b/launch/gazebo_iris_outdoor_world.launch @@ -1,6 +1,18 @@ <launch> -<include file="$(find rotors_gazebo)/launch/iris_outdoor_world_with_joy.launch" /> -<include file="$(find px4)/launch/iris.launch" /> + <arg name="headless" default="false"/> + <arg name="gui" default="true"/> + <arg name="enable_logging" default="false"/> + <arg name="enable_ground_truth" default="true"/> + <arg name="log_file" default="iris"/> + + <include file="$(find rotors_gazebo)/launch/iris_outdoor_world_with_joy.launch"> + <arg name="headless" value="$(arg headless)"/> + <arg name="gui" value="$(arg gui)"/> + <arg name="enable_logging" value="$(arg enable_logging)" /> + <arg name="enable_ground_truth" value="$(arg enable_ground_truth)" /> + <arg name="log_file" value="$(arg log_file)"/> + </include> + <include file="$(find px4)/launch/iris.launch" /> </launch> |