From 9924f5519f907568351aaa66fba01190b682a396 Mon Sep 17 00:00:00 2001
From: Andreas Antener <antener_a@gmx.ch>
Date: Tue, 7 Apr 2015 00:13:12 +0200
Subject: update attitude and position setpoint topics

---
 launch/mavros_sitl.launch | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'launch')

diff --git a/launch/mavros_sitl.launch b/launch/mavros_sitl.launch
index 7362fa464..60b85b6ff 100644
--- a/launch/mavros_sitl.launch
+++ b/launch/mavros_sitl.launch
@@ -9,10 +9,11 @@
 	<arg name="tgt_system" default="1" />
 	<arg name="tgt_component" default="50" />
 
-	<param name="mavros/setpoint/attitude/listen_twist" type="bool" value="false" />
+	<!-- TODO: fix for mavros 0.11.1 because of this: https://github.com/mavlink/mavros/commit/22c09f27e86876f049552cef75b6ceff047358fb -->
+	<param name="mavros/setpoint_attitude/attitude/listen_twist" type="bool" value="false" />
 
 	<include file="$(find mavros)/launch/node.launch">
-		<arg name="blacklist_yaml" value="$(find mavros)/launch/px4_blacklist.yaml" />
+		<arg name="pluginlists_yaml" value="$(find mavros)/launch/px4_pluginlists.yaml" />
 		<arg name="config_yaml" value="$(find mavros)/launch/px4_config.yaml" />
 
 		<arg name="fcu_url" value="$(arg fcu_url)" />
-- 
cgit v1.2.3


From a142b52e7bb3edad5bd6171917fb327ce43c6460 Mon Sep 17 00:00:00 2001
From: Andreas Antener <antener_a@gmx.ch>
Date: Wed, 8 Apr 2015 09:47:54 +0200
Subject: removed attitude parameter, configuration works now

---
 launch/mavros_sitl.launch | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'launch')

diff --git a/launch/mavros_sitl.launch b/launch/mavros_sitl.launch
index 60b85b6ff..f452f0945 100644
--- a/launch/mavros_sitl.launch
+++ b/launch/mavros_sitl.launch
@@ -9,9 +9,6 @@
 	<arg name="tgt_system" default="1" />
 	<arg name="tgt_component" default="50" />
 
-	<!-- TODO: fix for mavros 0.11.1 because of this: https://github.com/mavlink/mavros/commit/22c09f27e86876f049552cef75b6ceff047358fb -->
-	<param name="mavros/setpoint_attitude/attitude/listen_twist" type="bool" value="false" />
-
 	<include file="$(find mavros)/launch/node.launch">
 		<arg name="pluginlists_yaml" value="$(find mavros)/launch/px4_pluginlists.yaml" />
 		<arg name="config_yaml" value="$(find mavros)/launch/px4_config.yaml" />
-- 
cgit v1.2.3