From df4f8259026bb7882659303558f5fb5b0d99e5f6 Mon Sep 17 00:00:00 2001
From: Thomas Gubler <thomasgubler@gmail.com>
Date: Wed, 4 Mar 2015 20:58:54 +0100
Subject: [PATCH] ros offboard demo: move mavros into model namespace

---
 ...gazebo_ardrone_empty_world_offboard_attitudedemo.launch | 4 +++-
 ...gazebo_ardrone_empty_world_offboard_positiondemo.launch | 4 +++-
 launch/mavros_sitl.launch                                  | 7 +++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/launch/gazebo_ardrone_empty_world_offboard_attitudedemo.launch b/launch/gazebo_ardrone_empty_world_offboard_attitudedemo.launch
index 596496194a..1309529b63 100644
--- a/launch/gazebo_ardrone_empty_world_offboard_attitudedemo.launch
+++ b/launch/gazebo_ardrone_empty_world_offboard_attitudedemo.launch
@@ -4,7 +4,9 @@
 <include file="$(find px4)/launch/gazebo_ardrone_empty_world.launch">
 	<arg name="ns" value="$(arg ns)"/>
 </include>
-<include file="$(find px4)/launch/mavros_sitl.launch" />
+<include file="$(find px4)/launch/mavros_sitl.launch">
+	<arg name="ns" value="$(arg ns)"/>
+</include>
 <group ns="$(arg ns)">
 	<node pkg="px4" name="demo_offboard_attitude_setpoints" type="demo_offboard_attitude_setpoints"/>
 </group>
diff --git a/launch/gazebo_ardrone_empty_world_offboard_positiondemo.launch b/launch/gazebo_ardrone_empty_world_offboard_positiondemo.launch
index 46f427f936..0371306ce5 100644
--- a/launch/gazebo_ardrone_empty_world_offboard_positiondemo.launch
+++ b/launch/gazebo_ardrone_empty_world_offboard_positiondemo.launch
@@ -4,7 +4,9 @@
 <include file="$(find px4)/launch/gazebo_ardrone_empty_world.launch">
 	<arg name="ns" value="$(arg ns)"/>
 </include>
-<include file="$(find px4)/launch/mavros_sitl.launch" />
+<include file="$(find px4)/launch/mavros_sitl.launch">
+	<arg name="ns" value="$(arg ns)"/>
+</include>
 <group ns="$(arg ns)">
 	<node pkg="px4" name="demo_offboard_position_setpoints" type="demo_offboard_position_setpoints"/>
 </group>
diff --git a/launch/mavros_sitl.launch b/launch/mavros_sitl.launch
index 40010a2735..7752c682d1 100644
--- a/launch/mavros_sitl.launch
+++ b/launch/mavros_sitl.launch
@@ -1,7 +1,9 @@
 <launch>
-	<!-- vim: set ft=xml noet : -->
-	<!-- example launch script for PX4 based FCU's -->
+<!-- vim: set ft=xml noet : -->
+<!-- example launch script for PX4 based FCU's -->
 
+<arg name="ns"/>
+<group ns="$(arg ns)">
 	<arg name="fcu_url" default="udp://localhost:14560@localhost:14565" />
 	<arg name="gcs_url" default="" />
 	<arg name="tgt_system" default="1" />
@@ -18,4 +20,5 @@
 		<arg name="tgt_system" value="$(arg tgt_system)" />
 		<arg name="tgt_component" value="$(arg tgt_component)" />
 	</include>
+</group>
 </launch>