[Personalrobots-commit] SF.net SVN: personalrobots:[21833] pkg/trunk

[<stu...@us...>]

Revision: 21833
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=21833&view=rev
Author:   stuglaser
Date:     2009-08-13 21:17:19 +0000 (Thu, 13 Aug 2009)

Log Message:
-----------
Dealing with the movement of controller.h

Modified Paths:
--------------
    pkg/trunk/controllers/pr2_mechanism_controllers/manifest.xml
    pkg/trunk/controllers/pr2_mechanism_controllers/src/controller_manifest.cpp
    pkg/trunk/controllers/qualification_controllers/joint_qualification_controllers/manifest.xml
    pkg/trunk/controllers/qualification_controllers/joint_qualification_controllers/src/controller_manifest.cpp
    pkg/trunk/controllers/robot_mechanism_controllers/manifest.xml
    pkg/trunk/controllers/robot_mechanism_controllers/src/controller_manifest.cpp
    pkg/trunk/sandbox/experimental_controllers/manifest.xml
    pkg/trunk/sandbox/experimental_controllers/src/controller_manifest.cpp
    pkg/trunk/stacks/mechanism/mechanism_control/src/mechanism_control.cpp

Modified: pkg/trunk/controllers/pr2_mechanism_controllers/manifest.xml
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/manifest.xml	2009-08-13 21:10:03 UTC (rev 21832)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/manifest.xml	2009-08-13 21:17:19 UTC (rev 21833)
@@ -6,6 +6,7 @@
   <license>BSD</license>
   <review status="unreviewed" notes=""/>
   <depend package="roscpp" />
+  <depend package="controller_interface" />
   <depend package="mechanism_model" />
   <depend package="wg_robot_description_parser" />
   <depend package="misc_utils" />
@@ -34,7 +35,7 @@
   <export>
     <cpp cflags="-I${prefix}/include -I${prefix}/msg/cpp -I${prefix}/srv/cpp"
 	 lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lpr2_mechanism_controllers" />
-    <mechanism_control controller="${prefix}/controller_plugins.xml" />
+    <controller_interface controller="${prefix}/controller_plugins.xml" />
 
   </export>
 

Modified: pkg/trunk/controllers/pr2_mechanism_controllers/src/controller_manifest.cpp
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/src/controller_manifest.cpp	2009-08-13 21:10:03 UTC (rev 21832)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/src/controller_manifest.cpp	2009-08-13 21:17:19 UTC (rev 21833)
@@ -28,7 +28,7 @@
  */
 
 #include "pluginlib/plugin_macros.h"
-#include "mechanism_control/controller.h"
+#include "controller_interface/controller.h"
 
 #include "pr2_mechanism_controllers/caster_calibration_controller.h"
 #include "pr2_mechanism_controllers/caster_controller.h"

Modified: pkg/trunk/controllers/qualification_controllers/joint_qualification_controllers/manifest.xml
===================================================================
--- pkg/trunk/controllers/qualification_controllers/joint_qualification_controllers/manifest.xml	2009-08-13 21:10:03 UTC (rev 21832)
+++ pkg/trunk/controllers/qualification_controllers/joint_qualification_controllers/manifest.xml	2009-08-13 21:17:19 UTC (rev 21833)
@@ -4,6 +4,7 @@
   <author> Melonee Wise, Kevin Watts</author>
   <license>BSD</license>
   <review status="unreviewed" notes=""/>
+  <depend package="controller_interface" />
   <depend package="mechanism_model" />
   <depend package="wg_robot_description_parser" />
   <depend package="realtime_tools" />
@@ -17,7 +18,7 @@
   <repository>http://pr.willowgarage.com/repos</repository>
   <export>
     <cpp cflags='-I${prefix}/include -I${prefix}/msg/cpp -I${prefix}/srv/cpp' lflags='-Wl,-rpath,${prefix}/lib -L${prefix}/lib -ljoint_qualification_controllers'/>
-    <mechanism_control controller="${prefix}/controller_plugins.xml" />
+    <controller_interface controller="${prefix}/controller_plugins.xml" />
   </export>
 
 </package>

Modified: pkg/trunk/controllers/qualification_controllers/joint_qualification_controllers/src/controller_manifest.cpp
===================================================================
--- pkg/trunk/controllers/qualification_controllers/joint_qualification_controllers/src/controller_manifest.cpp	2009-08-13 21:10:03 UTC (rev 21832)
+++ pkg/trunk/controllers/qualification_controllers/joint_qualification_controllers/src/controller_manifest.cpp	2009-08-13 21:17:19 UTC (rev 21833)
@@ -28,7 +28,7 @@
  */
 
 #include "pluginlib/plugin_macros.h"
-#include "mechanism_control/controller.h"
+#include "controller_interface/controller.h"
 
 #include "joint_qualification_controllers/checkout_controller.h"
 #include "joint_qualification_controllers/hold_set_controller.h"

Modified: pkg/trunk/controllers/robot_mechanism_controllers/manifest.xml
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/manifest.xml	2009-08-13 21:10:03 UTC (rev 21832)
+++ pkg/trunk/controllers/robot_mechanism_controllers/manifest.xml	2009-08-13 21:17:19 UTC (rev 21833)
@@ -6,6 +6,7 @@
   <review status="unreviewed" notes=""/>
   <depend package="kdl_parser"/>
   <depend package="rospy"/>
+  <depend package="controller_interface" />
   <depend package="mechanism_model" />
   <depend package="mechanism_control" />
   <depend package="control_toolbox" />
@@ -32,7 +33,7 @@
   <export>
     <cpp cflags="-I${prefix}/include -I${prefix}/msg/cpp -I${prefix}/srv/cpp"
 	 lflags="-Wl,-rpath,${prefix}/lib/ -L${prefix}/lib -lrobot_mechanism_controllers" />
-    <mechanism_control controller="${prefix}/controller_plugins.xml" />
+    <controller_interface controller="${prefix}/controller_plugins.xml" />
   </export>
   <rosdep name="libtool"/>
 </package>

Modified: pkg/trunk/controllers/robot_mechanism_controllers/src/controller_manifest.cpp
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/src/controller_manifest.cpp	2009-08-13 21:10:03 UTC (rev 21832)
+++ pkg/trunk/controllers/robot_mechanism_controllers/src/controller_manifest.cpp	2009-08-13 21:17:19 UTC (rev 21833)
@@ -28,7 +28,7 @@
  */
 
 #include "pluginlib/plugin_macros.h"
-#include "mechanism_control/controller.h"
+#include "controller_interface/controller.h"
 
 #include "robot_mechanism_controllers/cartesian_hybrid_controller.h"
 #include "robot_mechanism_controllers/cartesian_pose_controller.h"

Modified: pkg/trunk/sandbox/experimental_controllers/manifest.xml
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/manifest.xml	2009-08-13 21:10:03 UTC (rev 21832)
+++ pkg/trunk/sandbox/experimental_controllers/manifest.xml	2009-08-13 21:17:19 UTC (rev 21833)
@@ -9,6 +9,7 @@
 
   <depend package="kdl_parser"/>
   <depend package="rospy"/>
+  <depend package="controller_interface" />
   <depend package="mechanism_model" />
   <depend package="mechanism_control" />
   <depend package="control_toolbox" />
@@ -32,7 +33,7 @@
   <export>
     <cpp cflags="-I${prefix}/include -I${prefix}/msg/cpp -I${prefix}/srv/cpp"
 	 lflags="-Wl,-rpath,${prefix}/lib/ -L${prefix}/lib -lexperimental_controllers" />
-   <mechanism_control controller="${prefix}/controller_plugins.xml" />
+   <controller_interface controller="${prefix}/controller_plugins.xml" />
   </export>
   <sysdepend os="ubuntu" version="8.04-hardy" package="libltdl3-dev"/>
   <rosdep name="libtool"/>

Modified: pkg/trunk/sandbox/experimental_controllers/src/controller_manifest.cpp
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/src/controller_manifest.cpp	2009-08-13 21:10:03 UTC (rev 21832)
+++ pkg/trunk/sandbox/experimental_controllers/src/controller_manifest.cpp	2009-08-13 21:17:19 UTC (rev 21833)
@@ -28,7 +28,7 @@
  */
 
 #include "pluginlib/plugin_macros.h"
-#include "mechanism_control/controller.h"
+#include "controller_interface/controller.h"
 
 #include "experimental_controllers/joint_trajectory_controller2.h"
 #include "experimental_controllers/pid_position_velocity_controller.h"

Modified: pkg/trunk/stacks/mechanism/mechanism_control/src/mechanism_control.cpp
===================================================================
--- pkg/trunk/stacks/mechanism/mechanism_control/src/mechanism_control.cpp	2009-08-13 21:10:03 UTC (rev 21832)
+++ pkg/trunk/stacks/mechanism/mechanism_control/src/mechanism_control.cpp	2009-08-13 21:17:19 UTC (rev 21833)
@@ -51,7 +51,7 @@
 
 MechanismControl::MechanismControl(HardwareInterface *hw) :
   state_(NULL), hw_(hw),
-  controller_loader_("mechanism_control", "controller"),
+  controller_loader_("controller_interface", "controller"),
   start_request_(0),
   stop_request_(0),
   please_switch_(false),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.