diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-13 11:46:50 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-13 11:46:50 +0100 |
commit | 0c82600b83cea4c47ae8810cf1b29c4c805f79cf (patch) | |
tree | 6186699000c92e5e16c120d871acba7bdd8fff91 /launch | |
parent | 1cff86b0b562301020973f354043f27272d29f5b (diff) | |
download | px4-firmware-0c82600b83cea4c47ae8810cf1b29c4c805f79cf.tar.gz px4-firmware-0c82600b83cea4c47ae8810cf1b29c4c805f79cf.tar.bz2 px4-firmware-0c82600b83cea4c47ae8810cf1b29c4c805f79cf.zip |
rename launch files and add iris empty world launch file
Diffstat (limited to 'launch')
-rw-r--r-- | launch/gazebo_ardrone_empty_world.launch (renamed from launch/gazebo_multicopter.launch) | 0 | ||||
-rw-r--r-- | launch/gazebo_ardrone_house_world.launch (renamed from launch/gazebo_multicopter_house_world.launch) | 0 | ||||
-rw-r--r-- | launch/gazebo_iris_empty_world.launch | 6 |
3 files changed, 6 insertions, 0 deletions
diff --git a/launch/gazebo_multicopter.launch b/launch/gazebo_ardrone_empty_world.launch index 8091e3ff2..8091e3ff2 100644 --- a/launch/gazebo_multicopter.launch +++ b/launch/gazebo_ardrone_empty_world.launch diff --git a/launch/gazebo_multicopter_house_world.launch b/launch/gazebo_ardrone_house_world.launch index 7b6be75ac..7b6be75ac 100644 --- a/launch/gazebo_multicopter_house_world.launch +++ b/launch/gazebo_ardrone_house_world.launch diff --git a/launch/gazebo_iris_empty_world.launch b/launch/gazebo_iris_empty_world.launch new file mode 100644 index 000000000..20574e00d --- /dev/null +++ b/launch/gazebo_iris_empty_world.launch @@ -0,0 +1,6 @@ +<launch> + +<include file="$(find mav_gazebo)/launch/iris_empty_world_with_joy.launch" /> +<include file="$(find px4)/launch/multicopter.launch" /> + +</launch> |