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

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

Revision: 4458
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=4458&view=rev
Author:   stuglaser
Date:     2008-09-18 23:53:29 +0000 (Thu, 18 Sep 2008)

Log Message:
-----------
Changed mechanism_control and gazebo_plugin to be consistent with the new controller layout.

Modified Paths:
--------------
    pkg/trunk/drivers/simulator/gazebo_plugin/CMakeLists.txt
    pkg/trunk/drivers/simulator/gazebo_plugin/manifest.xml
    pkg/trunk/mechanism/mechanism_control/include/mechanism_control/mechanism_control.h
    pkg/trunk/mechanism/mechanism_control/manifest.xml
    pkg/trunk/mechanism/mechanism_control/src/mechanism_control.cpp

Modified: pkg/trunk/drivers/simulator/gazebo_plugin/CMakeLists.txt
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/CMakeLists.txt	2008-09-18 23:52:56 UTC (rev 4457)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/CMakeLists.txt	2008-09-18 23:53:29 UTC (rev 4458)
@@ -17,7 +17,7 @@
 rospack_add_library(Ros_PTZ src/Ros_PTZ.cc)
 rospack_add_library(P3D src/P3D.cc)
 rospack_add_library(gazebo_actuators src/gazebo_actuators.cpp)
-rospack_add_library(test_actuators src/test_actuators.cpp)
+#rospack_add_library(test_actuators src/test_actuators.cpp)
 
 # This target requires adding player to the manifest.xml.
 #rospack_add_executable(player_pr2 src/player/Pr2_Player.cc)

Modified: pkg/trunk/drivers/simulator/gazebo_plugin/manifest.xml
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/manifest.xml	2008-09-18 23:52:56 UTC (rev 4457)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/manifest.xml	2008-09-18 23:53:29 UTC (rev 4458)
@@ -11,8 +11,8 @@
 <depend package="gazebo"/>
 <depend package="opende"/>
 <depend package="newmat10"/>
-<depend package="generic_controllers"/>
-<depend package="pr2_controllers"/>
+<depend package="robot_mechanism_controllers"/>
+<depend package="pr2_mechanism_controllers"/>
 <depend package="roscpp"/>
 <depend package="std_msgs" />
 <depend package="pr2_msgs" />

Modified: pkg/trunk/mechanism/mechanism_control/include/mechanism_control/mechanism_control.h
===================================================================
--- pkg/trunk/mechanism/mechanism_control/include/mechanism_control/mechanism_control.h	2008-09-18 23:52:56 UTC (rev 4457)
+++ pkg/trunk/mechanism/mechanism_control/include/mechanism_control/mechanism_control.h	2008-09-18 23:53:29 UTC (rev 4458)
@@ -42,7 +42,7 @@
 #include <hardware_interface/hardware_interface.h>
 #include <mechanism_model/robot.h>
 #include <rosthread/mutex.h>
-#include <generic_controllers/controller.h>
+#include <mechanism_model/controller.h>
 #include <misc_utils/realtime_publisher.h>
 
 #include "mechanism_control/ListControllerTypes.h"

Modified: pkg/trunk/mechanism/mechanism_control/manifest.xml
===================================================================
--- pkg/trunk/mechanism/mechanism_control/manifest.xml	2008-09-18 23:52:56 UTC (rev 4457)
+++ pkg/trunk/mechanism/mechanism_control/manifest.xml	2008-09-18 23:53:29 UTC (rev 4458)
@@ -9,7 +9,6 @@
 <depend package="hardware_interface"/>
 <depend package="tinyxml"/>
 <depend package="mechanism_model"/>
-<depend package="generic_controllers"/>
 <depend package="misc_utils" />
 <depend package="rospy" />
 <depend package="rosTF" />

Modified: pkg/trunk/mechanism/mechanism_control/src/mechanism_control.cpp
===================================================================
--- pkg/trunk/mechanism/mechanism_control/src/mechanism_control.cpp	2008-09-18 23:52:56 UTC (rev 4457)
+++ pkg/trunk/mechanism/mechanism_control/src/mechanism_control.cpp	2008-09-18 23:53:29 UTC (rev 4458)
@@ -29,7 +29,6 @@
  */
 
 #include "mechanism_control/mechanism_control.h"
-#include "generic_controllers/controller.h"
 #include "rosthread/member_thread.h"
 #include "rosTF/rosTF.h"
 


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