Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[23323] pkg/trunk
|
From: <mee...@us...> - 2009-08-29 01:41:23
|
Revision: 23323
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=23323&view=rev
Author: meeussen
Date: 2009-08-29 01:41:15 +0000 (Sat, 29 Aug 2009)
Log Message:
-----------
remove old controller register macro
Modified Paths:
--------------
pkg/trunk/sandbox/experimental_controllers/src/arm_trajectory_controller.cpp
pkg/trunk/sandbox/experimental_controllers/src/base_position_controller.cpp
pkg/trunk/sandbox/experimental_controllers/src/cartesian_pose_twist_controller.cpp
pkg/trunk/sandbox/experimental_controllers/src/cartesian_spline_trajectory_controller.cpp
pkg/trunk/sandbox/experimental_controllers/src/cartesian_trajectory_controller.cpp
pkg/trunk/sandbox/experimental_controllers/src/caster_calibration_controller_effort.cpp
pkg/trunk/sandbox/experimental_controllers/src/caster_controller_effort.cpp
pkg/trunk/sandbox/experimental_controllers/src/endeffector_constraint_controller.cpp
pkg/trunk/sandbox/experimental_controllers/src/joint_autotuner.cpp
pkg/trunk/sandbox/experimental_controllers/src/joint_blind_calibration_controller.cpp
pkg/trunk/sandbox/experimental_controllers/src/joint_calibration_controller.cpp
pkg/trunk/sandbox/experimental_controllers/src/joint_chain_sine_controller.cpp
pkg/trunk/sandbox/experimental_controllers/src/joint_inverse_dynamics_controller.cpp
pkg/trunk/sandbox/experimental_controllers/src/joint_limit_calibration_controller.cpp
pkg/trunk/sandbox/experimental_controllers/src/joint_position_smoothing_controller.cpp
pkg/trunk/sandbox/experimental_controllers/src/laser_scanner_qualification.cpp
pkg/trunk/sandbox/experimental_controllers/src/plug_controller.cpp
pkg/trunk/sandbox/experimental_controllers/src/probe.cpp
pkg/trunk/stacks/pr2_mechanism/pr2_controller_interface/include/pr2_controller_interface/controller.h
Modified: pkg/trunk/sandbox/experimental_controllers/src/arm_trajectory_controller.cpp
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/src/arm_trajectory_controller.cpp 2009-08-29 01:13:53 UTC (rev 23322)
+++ pkg/trunk/sandbox/experimental_controllers/src/arm_trajectory_controller.cpp 2009-08-29 01:41:15 UTC (rev 23323)
@@ -284,7 +284,6 @@
//------ Arm controller node --------
-ROS_REGISTER_CONTROLLER(ArmTrajectoryControllerNode)
ArmTrajectoryControllerNode::ArmTrajectoryControllerNode()
: Controller(), node_(ros::Node::instance()), request_trajectory_id_(1), current_trajectory_id_(0), trajectory_wait_timeout_(10.0)
Modified: pkg/trunk/sandbox/experimental_controllers/src/base_position_controller.cpp
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/src/base_position_controller.cpp 2009-08-29 01:13:53 UTC (rev 23322)
+++ pkg/trunk/sandbox/experimental_controllers/src/base_position_controller.cpp 2009-08-29 01:41:15 UTC (rev 23323)
@@ -37,7 +37,6 @@
using namespace pr2_mechanism_controllers ;
using namespace std ;
-ROS_REGISTER_CONTROLLER(BasePositionControllerNode)
BasePositionControllerNode::BasePositionControllerNode() : node_(ros::Node::instance()), tf_(*node_)
{
Modified: pkg/trunk/sandbox/experimental_controllers/src/cartesian_pose_twist_controller.cpp
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/src/cartesian_pose_twist_controller.cpp 2009-08-29 01:13:53 UTC (rev 23322)
+++ pkg/trunk/sandbox/experimental_controllers/src/cartesian_pose_twist_controller.cpp 2009-08-29 01:41:15 UTC (rev 23323)
@@ -47,7 +47,6 @@
namespace controller {
-ROS_REGISTER_CONTROLLER(CartesianPoseTwistController)
CartesianPoseTwistController::CartesianPoseTwistController()
: robot_state_(NULL),
Modified: pkg/trunk/sandbox/experimental_controllers/src/cartesian_spline_trajectory_controller.cpp
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/src/cartesian_spline_trajectory_controller.cpp 2009-08-29 01:13:53 UTC (rev 23322)
+++ pkg/trunk/sandbox/experimental_controllers/src/cartesian_spline_trajectory_controller.cpp 2009-08-29 01:41:15 UTC (rev 23323)
@@ -39,7 +39,6 @@
using namespace controller;
using namespace std;
-ROS_REGISTER_CONTROLLER(CartesianSplineTrajectoryController);
CartesianSplineTrajectoryController::CartesianSplineTrajectoryController():num_joints_(0),num_controllers_(0)
{
Modified: pkg/trunk/sandbox/experimental_controllers/src/cartesian_trajectory_controller.cpp
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/src/cartesian_trajectory_controller.cpp 2009-08-29 01:13:53 UTC (rev 23322)
+++ pkg/trunk/sandbox/experimental_controllers/src/cartesian_trajectory_controller.cpp 2009-08-29 01:41:15 UTC (rev 23323)
@@ -50,7 +50,6 @@
namespace controller {
-ROS_REGISTER_CONTROLLER(CartesianTrajectoryController)
CartesianTrajectoryController::CartesianTrajectoryController()
: jnt_to_pose_solver_(NULL),
Modified: pkg/trunk/sandbox/experimental_controllers/src/caster_calibration_controller_effort.cpp
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/src/caster_calibration_controller_effort.cpp 2009-08-29 01:13:53 UTC (rev 23322)
+++ pkg/trunk/sandbox/experimental_controllers/src/caster_calibration_controller_effort.cpp 2009-08-29 01:41:15 UTC (rev 23323)
@@ -153,7 +153,6 @@
}
-ROS_REGISTER_CONTROLLER(CasterCalibrationControllerEffortNode)
CasterCalibrationControllerEffortNode::CasterCalibrationControllerEffortNode()
: last_publish_time_(0), pub_calibrated_(NULL)
Modified: pkg/trunk/sandbox/experimental_controllers/src/caster_controller_effort.cpp
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/src/caster_controller_effort.cpp 2009-08-29 01:13:53 UTC (rev 23322)
+++ pkg/trunk/sandbox/experimental_controllers/src/caster_controller_effort.cpp 2009-08-29 01:41:15 UTC (rev 23323)
@@ -128,8 +128,6 @@
-ROS_REGISTER_CONTROLLER(CasterControllerEffortNode);
-
CasterControllerEffortNode::CasterControllerEffortNode()
{
}
Modified: pkg/trunk/sandbox/experimental_controllers/src/endeffector_constraint_controller.cpp
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/src/endeffector_constraint_controller.cpp 2009-08-29 01:13:53 UTC (rev 23322)
+++ pkg/trunk/sandbox/experimental_controllers/src/endeffector_constraint_controller.cpp 2009-08-29 01:41:15 UTC (rev 23323)
@@ -47,7 +47,6 @@
namespace controller {
-ROS_REGISTER_CONTROLLER(EndeffectorConstraintController)
EndeffectorConstraintController::EndeffectorConstraintController()
: jnt_to_jac_solver_(NULL),
@@ -328,9 +327,7 @@
-ROS_REGISTER_CONTROLLER(EndeffectorConstraintControllerNode)
-
EndeffectorConstraintControllerNode::EndeffectorConstraintControllerNode()
: node_(ros::Node::instance()), loop_count_(0)
{
Modified: pkg/trunk/sandbox/experimental_controllers/src/joint_autotuner.cpp
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/src/joint_autotuner.cpp 2009-08-29 01:13:53 UTC (rev 23322)
+++ pkg/trunk/sandbox/experimental_controllers/src/joint_autotuner.cpp 2009-08-29 01:41:15 UTC (rev 23323)
@@ -37,7 +37,6 @@
using namespace std;
using namespace controller;
#define POSITION 1
-ROS_REGISTER_CONTROLLER(JointAutotuner)
JointAutotuner::JointAutotuner()
{
@@ -306,7 +305,6 @@
/*
-ROS_REGISTER_CONTROLLER(JointAutotunerNode)
JointAutotunerNode::JointAutotunerNode()
{
std::cout<<"Created autotuner\n";
Modified: pkg/trunk/sandbox/experimental_controllers/src/joint_blind_calibration_controller.cpp
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/src/joint_blind_calibration_controller.cpp 2009-08-29 01:13:53 UTC (rev 23322)
+++ pkg/trunk/sandbox/experimental_controllers/src/joint_blind_calibration_controller.cpp 2009-08-29 01:41:15 UTC (rev 23323)
@@ -38,7 +38,6 @@
using namespace std;
using namespace controller;
-ROS_REGISTER_CONTROLLER(JointBlindCalibrationController)
JointBlindCalibrationController::JointBlindCalibrationController()
: state_(INITIALIZED), joint_(NULL)
@@ -189,8 +188,6 @@
}
-ROS_REGISTER_CONTROLLER(JointBlindCalibrationControllerNode)
-
JointBlindCalibrationControllerNode::JointBlindCalibrationControllerNode()
{
c_ = new JointBlindCalibrationController();
Modified: pkg/trunk/sandbox/experimental_controllers/src/joint_calibration_controller.cpp
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/src/joint_calibration_controller.cpp 2009-08-29 01:13:53 UTC (rev 23322)
+++ pkg/trunk/sandbox/experimental_controllers/src/joint_calibration_controller.cpp 2009-08-29 01:41:15 UTC (rev 23323)
@@ -38,7 +38,6 @@
using namespace std;
using namespace controller;
-//ROS_REGISTER_CONTROLLER(JointCalibrationController)
JointCalibrationController::JointCalibrationController()
: state_(INITIALIZED), actuator_(NULL), joint_(NULL), transmission_(NULL)
@@ -165,7 +164,6 @@
}
-ROS_REGISTER_CONTROLLER(JointCalibrationControllerNode)
JointCalibrationControllerNode::JointCalibrationControllerNode()
: robot_(NULL), last_publish_time_(0), pub_calibrated_(NULL)
Modified: pkg/trunk/sandbox/experimental_controllers/src/joint_chain_sine_controller.cpp
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/src/joint_chain_sine_controller.cpp 2009-08-29 01:13:53 UTC (rev 23322)
+++ pkg/trunk/sandbox/experimental_controllers/src/joint_chain_sine_controller.cpp 2009-08-29 01:41:15 UTC (rev 23323)
@@ -52,7 +52,6 @@
namespace controller
{
-ROS_REGISTER_CONTROLLER(JointChainSineController)
JointChainSineController::JointChainSineController():
robot_state_(NULL),
Modified: pkg/trunk/sandbox/experimental_controllers/src/joint_inverse_dynamics_controller.cpp
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/src/joint_inverse_dynamics_controller.cpp 2009-08-29 01:13:53 UTC (rev 23322)
+++ pkg/trunk/sandbox/experimental_controllers/src/joint_inverse_dynamics_controller.cpp 2009-08-29 01:41:15 UTC (rev 23323)
@@ -47,7 +47,6 @@
namespace controller {
-ROS_REGISTER_CONTROLLER(JointInverseDynamicsController);
JointInverseDynamicsController::JointInverseDynamicsController()
:robot_state_(NULL),
Modified: pkg/trunk/sandbox/experimental_controllers/src/joint_limit_calibration_controller.cpp
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/src/joint_limit_calibration_controller.cpp 2009-08-29 01:13:53 UTC (rev 23322)
+++ pkg/trunk/sandbox/experimental_controllers/src/joint_limit_calibration_controller.cpp 2009-08-29 01:41:15 UTC (rev 23323)
@@ -178,7 +178,6 @@
}
-ROS_REGISTER_CONTROLLER(JointLimitCalibrationControllerNode)
JointLimitCalibrationControllerNode::JointLimitCalibrationControllerNode()
: robot_(NULL), last_publish_time_(0)
Modified: pkg/trunk/sandbox/experimental_controllers/src/joint_position_smoothing_controller.cpp
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/src/joint_position_smoothing_controller.cpp 2009-08-29 01:13:53 UTC (rev 23322)
+++ pkg/trunk/sandbox/experimental_controllers/src/joint_position_smoothing_controller.cpp 2009-08-29 01:41:15 UTC (rev 23323)
@@ -163,7 +163,6 @@
/*
//------ Joint Position controller node --------
-ROS_REGISTER_CONTROLLER(JointPositionSmoothControllerNode)
JointPositionSmoothControllerNode::JointPositionSmoothControllerNode(): node_(ros::Node::instance())
{
Modified: pkg/trunk/sandbox/experimental_controllers/src/laser_scanner_qualification.cpp
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/src/laser_scanner_qualification.cpp 2009-08-29 01:13:53 UTC (rev 23322)
+++ pkg/trunk/sandbox/experimental_controllers/src/laser_scanner_qualification.cpp 2009-08-29 01:41:15 UTC (rev 23323)
@@ -48,7 +48,6 @@
using namespace std;
using namespace controller;
//#define DEBUG 1
-ROS_REGISTER_CONTROLLER(LaserScannerQualification)
LaserScannerQualification::LaserScannerQualification()
{
@@ -267,7 +266,6 @@
std::cout<<"\n";
}
-ROS_REGISTER_CONTROLLER(LaserScannerQualificationNode)
LaserScannerQualificationNode::LaserScannerQualificationNode()
{
c_ = new LaserScannerQualification();
Modified: pkg/trunk/sandbox/experimental_controllers/src/plug_controller.cpp
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/src/plug_controller.cpp 2009-08-29 01:13:53 UTC (rev 23322)
+++ pkg/trunk/sandbox/experimental_controllers/src/plug_controller.cpp 2009-08-29 01:41:15 UTC (rev 23323)
@@ -48,7 +48,6 @@
namespace controller {
-ROS_REGISTER_CONTROLLER(PlugController)
PlugController::PlugController() :
outlet_pt_(1, 0, 0),
@@ -349,9 +348,7 @@
-ROS_REGISTER_CONTROLLER(PlugControllerNode)
-
PlugControllerNode::PlugControllerNode()
: node_(ros::Node::instance()), loop_count_(0), TF(*ros::Node::instance(),false,ros::Duration(10.0))
{
Modified: pkg/trunk/sandbox/experimental_controllers/src/probe.cpp
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/src/probe.cpp 2009-08-29 01:13:53 UTC (rev 23322)
+++ pkg/trunk/sandbox/experimental_controllers/src/probe.cpp 2009-08-29 01:41:15 UTC (rev 23323)
@@ -32,7 +32,6 @@
namespace controller {
-ROS_REGISTER_CONTROLLER(Probe)
Probe::Probe()
: robot_(NULL), joint_(NULL)
Modified: pkg/trunk/stacks/pr2_mechanism/pr2_controller_interface/include/pr2_controller_interface/controller.h
===================================================================
--- pkg/trunk/stacks/pr2_mechanism/pr2_controller_interface/include/pr2_controller_interface/controller.h 2009-08-29 01:13:53 UTC (rev 23322)
+++ pkg/trunk/stacks/pr2_mechanism/pr2_controller_interface/include/pr2_controller_interface/controller.h 2009-08-29 01:41:15 UTC (rev 23323)
@@ -154,7 +154,4 @@
};
-
-// @ TODO: remove macro call from controllers
-#define ROS_REGISTER_CONTROLLER(c)
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
