diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2015-02-28 18:15:51 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-03-10 20:56:53 +0100 |
commit | c07c39bc438695101dc58d2fda2e14914e019ca4 (patch) | |
tree | 1bfd6e649b721dd896952308f2a999cfb08e4788 /launch/gazebo_ardrone_house_world.launch | |
parent | 1837440e4336fda1462de24d622d200d67471ac5 (diff) | |
download | px4-firmware-c07c39bc438695101dc58d2fda2e14914e019ca4.tar.gz px4-firmware-c07c39bc438695101dc58d2fda2e14914e019ca4.tar.bz2 px4-firmware-c07c39bc438695101dc58d2fda2e14914e019ca4.zip |
update ros launch files and nodes for update of rotors_simulator
Diffstat (limited to 'launch/gazebo_ardrone_house_world.launch')
-rw-r--r-- | launch/gazebo_ardrone_house_world.launch | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/launch/gazebo_ardrone_house_world.launch b/launch/gazebo_ardrone_house_world.launch index c636868eb..89f27c901 100644 --- a/launch/gazebo_ardrone_house_world.launch +++ b/launch/gazebo_ardrone_house_world.launch @@ -4,15 +4,18 @@ <arg name="gui" default="true"/> <arg name="enable_logging" default="false"/> <arg name="enable_ground_truth" default="true"/> - <arg name="log_file" default="ardrone"/> + <arg name="ns" default="ardrone"/> + <arg name="log_file" default="$(arg ns)"/> - <include file="$(find rotors_gazebo)/launch/ardrone_house_world_with_joy.launch"> + <include file="$(find rotors_gazebo)/launch/ardrone_house_world.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" /> + <include file="$(find px4)/launch/ardrone.launch"> + <arg name="ns" value="$(arg ns)"/> + </include> </launch> |