diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2015-03-04 20:58:54 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-03-10 20:56:53 +0100 |
| commit | df4f8259026bb7882659303558f5fb5b0d99e5f6 (patch) | |
| tree | b3b3c0054ee4e26b7557527374010341072b595e /launch | |
| parent | c07c39bc438695101dc58d2fda2e14914e019ca4 (diff) | |
| download | px4-firmware-df4f8259026bb7882659303558f5fb5b0d99e5f6.tar.gz px4-firmware-df4f8259026bb7882659303558f5fb5b0d99e5f6.tar.bz2 px4-firmware-df4f8259026bb7882659303558f5fb5b0d99e5f6.zip | |
ros offboard demo: move mavros into model namespace
Diffstat (limited to 'launch')
| -rw-r--r-- | launch/gazebo_ardrone_empty_world_offboard_attitudedemo.launch | 4 | ||||
| -rw-r--r-- | launch/gazebo_ardrone_empty_world_offboard_positiondemo.launch | 4 | ||||
| -rw-r--r-- | 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 596496194..1309529b6 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 46f427f93..0371306ce 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 40010a273..7752c682d 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> |