diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-14 11:27:32 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-14 11:27:32 +0100 |
| commit | 6b0d0aa2a5d2e9623ab2850396818679672715e9 (patch) | |
| tree | 4905cfd2f124367d029cdeace80eb019420c02be /launch | |
| parent | f6c0d2310d538e44c3764f3a13d80789ca34170e (diff) | |
| download | px4-firmware-6b0d0aa2a5d2e9623ab2850396818679672715e9.tar.gz px4-firmware-6b0d0aa2a5d2e9623ab2850396818679672715e9.tar.bz2 px4-firmware-6b0d0aa2a5d2e9623ab2850396818679672715e9.zip | |
ros: make mixer name a param
Diffstat (limited to 'launch')
| -rw-r--r-- | launch/gazebo_ardrone_empty_world.launch | 2 | ||||
| -rw-r--r-- | launch/gazebo_ardrone_house_world.launch | 2 | ||||
| -rw-r--r-- | launch/gazebo_iris_empty_world.launch | 2 | ||||
| -rw-r--r-- | launch/gazebo_iris_outdoor_world.launch | 2 | ||||
| -rw-r--r-- | launch/multicopter.launch | 1 | ||||
| -rw-r--r-- | launch/multicopter_w.launch | 9 | ||||
| -rw-r--r-- | launch/multicopter_x.launch | 9 |
7 files changed, 23 insertions, 4 deletions
diff --git a/launch/gazebo_ardrone_empty_world.launch b/launch/gazebo_ardrone_empty_world.launch index 8091e3ff2..00ef7ab45 100644 --- a/launch/gazebo_ardrone_empty_world.launch +++ b/launch/gazebo_ardrone_empty_world.launch @@ -1,6 +1,6 @@ <launch> <include file="$(find mav_gazebo)/launch/ardrone_empty_world_with_joy.launch" /> -<include file="$(find px4)/launch/multicopter.launch" /> +<include file="$(find px4)/launch/multicopter_x.launch" /> </launch> diff --git a/launch/gazebo_ardrone_house_world.launch b/launch/gazebo_ardrone_house_world.launch index 7b6be75ac..f9ac1cac5 100644 --- a/launch/gazebo_ardrone_house_world.launch +++ b/launch/gazebo_ardrone_house_world.launch @@ -1,6 +1,6 @@ <launch> <include file="$(find mav_gazebo)/launch/ardrone_house_world_with_joy.launch" /> -<include file="$(find px4)/launch/multicopter.launch" /> +<include file="$(find px4)/launch/multicopter_x.launch" /> </launch> diff --git a/launch/gazebo_iris_empty_world.launch b/launch/gazebo_iris_empty_world.launch index 20574e00d..22e032978 100644 --- a/launch/gazebo_iris_empty_world.launch +++ b/launch/gazebo_iris_empty_world.launch @@ -1,6 +1,6 @@ <launch> <include file="$(find mav_gazebo)/launch/iris_empty_world_with_joy.launch" /> -<include file="$(find px4)/launch/multicopter.launch" /> +<include file="$(find px4)/launch/multicopter_w.launch" /> </launch> diff --git a/launch/gazebo_iris_outdoor_world.launch b/launch/gazebo_iris_outdoor_world.launch index e7fd0b395..88960b5ec 100644 --- a/launch/gazebo_iris_outdoor_world.launch +++ b/launch/gazebo_iris_outdoor_world.launch @@ -1,6 +1,6 @@ <launch> <include file="$(find mav_gazebo)/launch/iris_outdoor_world_with_joy.launch" /> -<include file="$(find px4)/launch/multicopter.launch" /> +<include file="$(find px4)/launch/multicopter_x.launch" /> </launch> diff --git a/launch/multicopter.launch b/launch/multicopter.launch index 0a4b8c26d..79c3c36d9 100644 --- a/launch/multicopter.launch +++ b/launch/multicopter.launch @@ -19,6 +19,7 @@ <param name="MC_YAWRATE_P" type="double" value="0.5" /> <param name="MC_MAN_R_MAX" type="double" value="10.0" /> <param name="MC_MAN_P_MAX" type="double" value="10.0" /> + <param name="mixer" type="string" value="x" /> </group> </launch> diff --git a/launch/multicopter_w.launch b/launch/multicopter_w.launch new file mode 100644 index 000000000..f124082aa --- /dev/null +++ b/launch/multicopter_w.launch @@ -0,0 +1,9 @@ +<launch> + +<include file="$(find px4)/launch/multicopter.launch" /> + +<group ns="px4_multicopter"> + <param name="mixer" type="string" value="w" /> +</group> + +</launch> diff --git a/launch/multicopter_x.launch b/launch/multicopter_x.launch new file mode 100644 index 000000000..6355b87be --- /dev/null +++ b/launch/multicopter_x.launch @@ -0,0 +1,9 @@ +<launch> + +<include file="$(find px4)/launch/multicopter.launch" /> + +<group ns="px4_multicopter"> + <param name="mixer" type="string" value="x" /> +</group> + +</launch> |