launch #257: rename blacklist.yaml to pluginlists.yaml

mavlink · Mar 24, 2015 · 7f0a3dd · 7f0a3dd
1 parent 50bb326
commit 7f0a3dd
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/mavros/launch/apm.launch b/mavros/launch/apm.launch
@@ -8,7 +8,7 @@
 	<arg name="tgt_component" default="1" />
 
 	<include file="$(find mavros)/launch/node.launch">
-		<arg name="blacklist_yaml" value="$(find mavros)/launch/apm_blacklist.yaml" />
+		<arg name="pluginlists_yaml" value="$(find mavros)/launch/apm_pluginlists.yaml" />
 		<arg name="config_yaml" value="$(find mavros)/launch/apm_config.yaml" />
 
 		<arg name="fcu_url" value="$(arg fcu_url)" />

diff --git a/mavros/launch/apm_blacklist.yaml → mavros/launch/apm_pluginlists.yaml b/mavros/launch/apm_blacklist.yaml → mavros/launch/apm_pluginlists.yaml
@@ -11,3 +11,6 @@ plugin_blacklist:
 - px4flow
 - 'vision_*'
 - visualization
+
+plugin_whitelist: []
+#- 'sys_*'
diff --git a/mavros/launch/node.launch b/mavros/launch/node.launch
@@ -6,7 +6,7 @@
 	<arg name="gcs_url" />
 	<arg name="tgt_system" />
 	<arg name="tgt_component" />
-	<arg name="blacklist_yaml" />
+	<arg name="pluginlists_yaml" />
 	<arg name="config_yaml" />
 
 	<node pkg="mavros" type="mavros_node" name="mavros" required="true" clear_params="true" output="screen">
@@ -16,7 +16,7 @@
 		<param name="target_component_id" value="$(arg tgt_component)" />
 
 		<!-- load blacklist, config -->
-		<rosparam command="load" file="$(arg blacklist_yaml)" />
+		<rosparam command="load" file="$(arg pluginlists_yaml)" />
 		<rosparam command="load" file="$(arg config_yaml)" />
 	</node>
 </launch>
diff --git a/mavros/launch/px4.launch b/mavros/launch/px4.launch
@@ -8,7 +8,7 @@
 	<arg name="tgt_component" default="50" />
 
 	<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)" />

diff --git a/mavros/launch/px4_blacklist.yaml b/mavros/launch/px4_blacklist.yaml
diff --git a/mavros/launch/px4_pluginlists.yaml b/mavros/launch/px4_pluginlists.yaml
@@ -0,0 +1,5 @@
+plugin_blacklist:
+- 'image_pub'
+
+plugin_whitelist: []
+#- 'sys_*'