Closes #122, closes #123; plugins: move mocap & vision plugins to ext…

…ras, change vision plugins name
mavlink · Aug 16, 2014 · de5905b · de5905b
1 parent 7dc7bad
commit de5905b
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 433 deletions.
diff --git a/mavros/CMakeLists.txt b/mavros/CMakeLists.txt
@@ -187,15 +187,12 @@ add_library(mavros_plugins
   src/plugins/command.cpp
   src/plugins/local_position.cpp
   src/plugins/global_position.cpp
-  src/plugins/vision_position.cpp
   src/plugins/setpoint_position.cpp
   src/plugins/safety_area.cpp
   src/plugins/3dr_radio.cpp
   src/plugins/setpoint_velocity.cpp
   src/plugins/setpoint_accel.cpp
   src/plugins/setpoint_attitude.cpp
-  src/plugins/vision_speed.cpp
-  src/plugins/mocap_pose_estimate.cpp
 )
 add_dependencies(mavros_plugins
   mavros_generate_messages_cpp

diff --git a/mavros/mavros_plugins.xml b/mavros/mavros_plugins.xml
@@ -29,9 +29,6 @@
 	<class name="global_position" type="mavplugin::GlobalPositionPlugin" base_class_type="mavplugin::MavRosPlugin">
 		<description>Publish FCU global position.</description>
 	</class>
-	<class name="vision_position" type="mavplugin::VisionPositionPlugin" base_class_type="mavplugin::MavRosPlugin">
-		<description>Send to FCU vision position estimates.</description>
-	</class>
 	<class name="setpoint_position" type="mavplugin::SetpointPositionPlugin" base_class_type="mavplugin::MavRosPlugin">
 		<description>Send to FCU external position setpoint.</description>
 	</class>
@@ -50,11 +47,5 @@
 	<class name="setpoint_attitude" type="mavplugin::SetpointAttitudePlugin" base_class_type="mavplugin::MavRosPlugin">
 		<description>Send to FCU external attitude setpoint.</description>
 	</class>
-	<class name="vision_speed" type="mavplugin::VisionSpeedPlugin" base_class_type="mavplugin::MavRosPlugin">
-		<description>Send vision speed estimate to FCU.</description>
-	</class>
-	<class name="mocap_pose_estimate" type="mavplugin::MocapPoseEstimatePlugin" base_class_type="mavplugin::MavRosPlugin">
-		<description>Send motion capture's pose data to FCU.</description>
-	</class>
 </library>
 
diff --git a/mavros/src/plugins/mocap_pose_estimate.cpp b/mavros/src/plugins/mocap_pose_estimate.cpp
diff --git a/mavros/src/plugins/vision_position.cpp b/mavros/src/plugins/vision_position.cpp