Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[23320] pkg/trunk
|
From: <mee...@us...> - 2009-08-29 00:23:50
|
Revision: 23320
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=23320&view=rev
Author: meeussen
Date: 2009-08-29 00:23:26 +0000 (Sat, 29 Aug 2009)
Log Message:
-----------
rename include folders to pr2_something. door test passes
Modified Paths:
--------------
pkg/trunk/calibration_experimental/laser_cb_processing/src/pr2_tilt_laser_projector.cpp
pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/base_kinematics.h
pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/caster_controller.h
pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/gripper_calibration_controller.h
pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/head_position_controller.h
pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/laser_scanner_traj_controller.h
pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/wrist_calibration_controller.h
pkg/trunk/controllers/pr2_mechanism_controllers/src/head_position_controller.cpp
pkg/trunk/controllers/pr2_mechanism_controllers/test/test_base_controller.cpp
pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/cartesian_pose_controller.h
pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/cartesian_twist_controller.h
pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/cartesian_wrench_controller.h
pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/joint_effort_controller.h
pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/joint_position_controller.h
pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/joint_ud_calibration_controller.h
pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/joint_velocity_controller.h
pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/trigger_controller.h
pkg/trunk/controllers/robot_mechanism_controllers/src/cartesian_pose_controller.cpp
pkg/trunk/controllers/robot_mechanism_controllers/src/cartesian_twist_controller.cpp
pkg/trunk/sandbox/dallas_controller/src/dallas_controller.cpp
pkg/trunk/sandbox/dynamics_estimation/include/dynamics_estimation/dynamics_estimation_node.h
pkg/trunk/sandbox/dynamics_estimation/manifest.xml
pkg/trunk/sandbox/dynamics_estimation/src/dynamics_estimation_node.cpp
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/arm_trajectory_controller.h
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/cartesian_hybrid_controller.h
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/cartesian_pose_twist_controller.h
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/cartesian_spline_trajectory_controller.h
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/cartesian_tff_controller.h
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/cartesian_trajectory_controller.h
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/cartesian_twist_controller_ik.h
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/caster_controller_effort.h
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/endeffector_constraint_controller.h
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/head_servoing_controller.h
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_autotuner.h
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_blind_calibration_controller.h
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_calibration_controller.h
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_chain_constraint_controller.h
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_chain_sine_controller.h
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_inverse_dynamics_controller.h
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_limit_calibration_controller.h
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_pd_controller.h
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_position_smoothing_controller.h
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_trajectory_controller.h
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/laser_scanner_qualification.h
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/pid_position_velocity_controller.h
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/plug_controller.h
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/pr2_gripper_controller.h
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/probe.h
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/trajectory_controller.h
pkg/trunk/sandbox/experimental_controllers/src/cartesian_pose_twist_controller.cpp
pkg/trunk/sandbox/experimental_controllers/src/cartesian_tff_controller.cpp
pkg/trunk/sandbox/experimental_controllers/src/cartesian_trajectory_controller.cpp
pkg/trunk/sandbox/experimental_controllers/src/cartesian_twist_controller_ik.cpp
pkg/trunk/sandbox/experimental_controllers/src/head_servoing_controller.cpp
pkg/trunk/sandbox/mechanism_control_test/include/mechanism_controller_test/null_hardware.h
pkg/trunk/sandbox/mechanism_control_test/src/mechanism_controller_test.cpp
pkg/trunk/sandbox/mechanism_control_test/src/null_hardware.cpp
pkg/trunk/sandbox/pr2_gripper_controller/include/pr2_gripper_controller/pr2_gripper_controller.h
pkg/trunk/sandbox/qualification_controllers/joint_qualification_controllers/include/joint_qualification_controllers/checkout_controller.h
pkg/trunk/sandbox/qualification_controllers/joint_qualification_controllers/include/joint_qualification_controllers/hold_set_controller.h
pkg/trunk/sandbox/qualification_controllers/joint_qualification_controllers/include/joint_qualification_controllers/hysteresis_controller.h
pkg/trunk/sandbox/qualification_controllers/joint_qualification_controllers/include/joint_qualification_controllers/sine_sweep_controller.h
pkg/trunk/sandbox/rtt_controller/src/pr2_etherCAT_component.cpp
pkg/trunk/sandbox/trajectory_controllers/include/trajectory_controllers/joint_trajectory_controller2.h
pkg/trunk/stacks/pr2/pr2_etherCAT/src/main.cpp
pkg/trunk/stacks/pr2_ethercat_drivers/ethercat_hardware/include/ethercat_hardware/ethercat_device.h
pkg/trunk/stacks/pr2_ethercat_drivers/ethercat_hardware/include/ethercat_hardware/ethercat_hardware.h
pkg/trunk/stacks/pr2_mechanism/pr2_controller_interface/include/pr2_controller_interface/controller.h
pkg/trunk/stacks/pr2_mechanism/pr2_controller_interface/manifest.xml
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/include/mechanism_control/controller_spec.h
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/include/mechanism_control/mechanism_control.h
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/include/mechanism_control/recorder.h
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/include/mechanism_control/scheduler.h
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/scripts/mech.py
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/scripts/spawner.py
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/src/action_mechanism_control.cpp
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/src/mechanism_control.cpp
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/src/recorder.cpp
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/src/scheduler.cpp
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/test/ms_publisher_test.cpp
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/include/pr2_mechanism_model/chain.h
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/include/pr2_mechanism_model/gripper_transmission.h
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/include/pr2_mechanism_model/link.h
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/include/pr2_mechanism_model/pr2_gripper_transmission.h
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/include/pr2_mechanism_model/robot.h
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/include/pr2_mechanism_model/simple_transmission.h
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/include/pr2_mechanism_model/transmission.h
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/include/pr2_mechanism_model/wrist_transmission.h
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/src/chain.cpp
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/src/gripper_transmission.cpp
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/src/joint.cpp
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/src/link.cpp
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/src/nonlinear_transmission.cpp
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/src/pr2_gripper_transmission.cpp
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/src/robot.cpp
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/src/simple_transmission.cpp
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/src/wrist_transmission.cpp
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/test/test_chain.cpp
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/transmission_plugins.xml
pkg/trunk/stacks/pr2_simulator/gazebo_plugin/include/gazebo_plugin/gazebo_mechanism_control.h
pkg/trunk/stacks/pr2_simulator/gazebo_plugin/src/gazebo_mechanism_control.cpp
pkg/trunk/stacks/trex/trex_pr2/cfg/master.cfg
pkg/trunk/stacks/trex/trex_pr2/cfg/mechanism_control.cfg
Added Paths:
-----------
pkg/trunk/stacks/pr2_mechanism/pr2_controller_interface/include/pr2_controller_interface/
pkg/trunk/stacks/pr2_mechanism/pr2_hardware_interface/include/pr2_hardware_interface/
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/src/pr2_mechanism_control/
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/include/pr2_mechanism_model/
Removed Paths:
-------------
pkg/trunk/stacks/pr2_mechanism/pr2_controller_interface/include/controller_interface/
pkg/trunk/stacks/pr2_mechanism/pr2_hardware_interface/include/hardware_interface/
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/src/mechanism_control/
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/include/mechanism_model/
Modified: pkg/trunk/calibration_experimental/laser_cb_processing/src/pr2_tilt_laser_projector.cpp
===================================================================
--- pkg/trunk/calibration_experimental/laser_cb_processing/src/pr2_tilt_laser_projector.cpp 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/calibration_experimental/laser_cb_processing/src/pr2_tilt_laser_projector.cpp 2009-08-29 00:23:26 UTC (rev 23320)
@@ -35,10 +35,10 @@
#include "ros/node_handle.h"
#include "sensor_msgs/PointCloud.h"
-#include "mechanism_model/robot.h"
-#include "mechanism_model/chain.h"
+#include "pr2_mechanism_model/robot.h"
+#include "pr2_mechanism_model/chain.h"
#include "tinyxml/tinyxml.h"
-#include "hardware_interface/hardware_interface.h"
+#include "pr2_hardware_interface/hardware_interface.h"
#include "kdl/chainfksolverpos_recursive.hpp"
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/base_kinematics.h
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/base_kinematics.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/base_kinematics.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -38,8 +38,8 @@
#ifndef PR2_BASE_KINEMATICS_H
#define PR2_BASE_KINEMATICS_H
-#include <mechanism_model/robot.h>
-#include <controller_interface/controller.h>
+#include <pr2_mechanism_model/robot.h>
+#include <pr2_controller_interface/controller.h>
#include <geometry_msgs/Twist.h>
#include <geometry_msgs/Point.h>
#include <control_toolbox/filters.h>
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/caster_controller.h
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/caster_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/caster_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -44,8 +44,8 @@
#include "ros/node_handle.h"
-#include "controller_interface/controller.h"
-#include "mechanism_model/robot.h"
+#include "pr2_controller_interface/controller.h"
+#include "pr2_mechanism_model/robot.h"
#include "control_toolbox/pid.h"
#include "robot_mechanism_controllers/joint_velocity_controller.h"
#include "std_msgs/Float64.h"
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/gripper_calibration_controller.h
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/gripper_calibration_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/gripper_calibration_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -36,7 +36,7 @@
-#include "mechanism_model/robot.h"
+#include "pr2_mechanism_model/robot.h"
#include "robot_mechanism_controllers/joint_velocity_controller.h"
#include "realtime_tools/realtime_publisher.h"
#include "std_msgs/Empty.h"
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/head_position_controller.h
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/head_position_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/head_position_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -41,7 +41,7 @@
#include <ros/node.h>
#include <ros/node_handle.h>
-#include <controller_interface/controller.h>
+#include <pr2_controller_interface/controller.h>
#include <tf/transform_listener.h>
#include <tf/message_notifier.h>
#include <tf/transform_datatypes.h>
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/laser_scanner_traj_controller.h
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/laser_scanner_traj_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/laser_scanner_traj_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -36,7 +36,7 @@
#include <ros/node.h>
-#include <controller_interface/controller.h>
+#include <pr2_controller_interface/controller.h>
#include <control_toolbox/pid.h>
//#include <robot_mechanism_controllers/joint_position_smoothing_controller.h>
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/wrist_calibration_controller.h
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/wrist_calibration_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/wrist_calibration_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -45,7 +45,7 @@
#include "robot_mechanism_controllers/joint_velocity_controller.h"
#include "realtime_tools/realtime_publisher.h"
-#include "mechanism_model/wrist_transmission.h"
+#include "pr2_mechanism_model/wrist_transmission.h"
#include "std_msgs/Empty.h"
namespace controller {
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/src/head_position_controller.cpp
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/src/head_position_controller.cpp 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/src/head_position_controller.cpp 2009-08-29 00:23:26 UTC (rev 23320)
@@ -35,7 +35,7 @@
#include "pr2_mechanism_controllers/head_position_controller.h"
#include <cmath>
-#include "mechanism_control/mechanism_control.h"
+#include "pr2_mechanism_control/mechanism_control.h"
#include "pluginlib/class_list_macros.h"
using namespace tf;
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/test/test_base_controller.cpp
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/test/test_base_controller.cpp 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/test/test_base_controller.cpp 2009-08-29 00:23:26 UTC (rev 23320)
@@ -1,7 +1,7 @@
#include <pr2_mechanism_controllers/base_controller.h>
#include <hardware_interface/hardware_interface.h>
-#include <mechanism_model/robot.h>
+#include <pr2_mechanism_model/robot.h>
#include <urdf/parser.h>
#include <ros/node.h>
Modified: pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/cartesian_pose_controller.h
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/cartesian_pose_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/cartesian_pose_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -77,7 +77,7 @@
#include <ros/node.h>
#include <geometry_msgs/PoseStamped.h>
#include <geometry_msgs/Twist.h>
-#include <controller_interface/controller.h>
+#include <pr2_controller_interface/controller.h>
#include <realtime_tools/realtime_publisher.h>
#include <boost/scoped_ptr.hpp>
#include "robot_mechanism_controllers/cartesian_twist_controller.h"
Modified: pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/cartesian_twist_controller.h
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/cartesian_twist_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/cartesian_twist_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -67,7 +67,7 @@
#include <kdl/frames.hpp>
#include <ros/node.h>
#include <geometry_msgs/Twist.h>
-#include <controller_interface/controller.h>
+#include <pr2_controller_interface/controller.h>
#include <tf/transform_datatypes.h>
#include <robot_mechanism_controllers/cartesian_wrench_controller.h>
#include <control_toolbox/pid.h>
Modified: pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/cartesian_wrench_controller.h
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/cartesian_wrench_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/cartesian_wrench_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -60,8 +60,8 @@
#include <kdl/chainjnttojacsolver.hpp>
#include <ros/node_handle.h>
#include <geometry_msgs/Wrench.h>
-#include <controller_interface/controller.h>
-#include <mechanism_model/chain.h>
+#include <pr2_controller_interface/controller.h>
+#include <pr2_mechanism_model/chain.h>
#include <tf/transform_datatypes.h>
#include <realtime_tools/realtime_publisher.h>
#include <boost/scoped_ptr.hpp>
Modified: pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/joint_effort_controller.h
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/joint_effort_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/joint_effort_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -52,7 +52,7 @@
*/
#include <ros/node.h>
-#include <controller_interface/controller.h>
+#include <pr2_controller_interface/controller.h>
#include <std_msgs/Float64.h>
Modified: pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/joint_position_controller.h
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/joint_position_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/joint_position_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -60,7 +60,7 @@
#include <ros/node.h>
-#include <controller_interface/controller.h>
+#include <pr2_controller_interface/controller.h>
#include <control_toolbox/pid.h>
#include "control_toolbox/pid_gains_setter.h"
#include <boost/scoped_ptr.hpp>
Modified: pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/joint_ud_calibration_controller.h
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/joint_ud_calibration_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/joint_ud_calibration_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -35,7 +35,7 @@
#pragma once
#include "ros/node_handle.h"
-#include "mechanism_model/robot.h"
+#include "pr2_mechanism_model/robot.h"
#include "robot_mechanism_controllers/joint_velocity_controller.h"
#include "realtime_tools/realtime_publisher.h"
#include "std_msgs/Empty.h"
Modified: pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/joint_velocity_controller.h
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/joint_velocity_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/joint_velocity_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -63,7 +63,7 @@
#include <ros/node_handle.h>
#include <boost/scoped_ptr.hpp>
-#include "controller_interface/controller.h"
+#include "pr2_controller_interface/controller.h"
#include "control_toolbox/pid.h"
#include "control_toolbox/pid_gains_setter.h"
Modified: pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/trigger_controller.h
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/trigger_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/trigger_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -36,10 +36,9 @@
#define TRIGGER_CONTROLLER_H
#include <ros/node.h>
-#include <controller_interface/controller.h>
-#include <mechanism_model/robot.h>
+#include <pr2_controller_interface/controller.h>
+#include <pr2_mechanism_model/robot.h>
#include <robot_mechanism_controllers/SetWaveform.h>
-#include "hardware_interface/hardware_interface.h"
#include <realtime_tools/realtime_publisher.h>
#include <roslib/Header.h>
#include <boost/scoped_ptr.hpp>
Modified: pkg/trunk/controllers/robot_mechanism_controllers/src/cartesian_pose_controller.cpp
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/src/cartesian_pose_controller.cpp 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/controllers/robot_mechanism_controllers/src/cartesian_pose_controller.cpp 2009-08-29 00:23:26 UTC (rev 23320)
@@ -36,7 +36,7 @@
#include "robot_mechanism_controllers/cartesian_pose_controller.h"
#include <algorithm>
#include "kdl/chainfksolverpos_recursive.hpp"
-#include "mechanism_control/mechanism_control.h"
+#include "pr2_mechanism_control/mechanism_control.h"
#include "pluginlib/class_list_macros.h"
Modified: pkg/trunk/controllers/robot_mechanism_controllers/src/cartesian_twist_controller.cpp
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/src/cartesian_twist_controller.cpp 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/controllers/robot_mechanism_controllers/src/cartesian_twist_controller.cpp 2009-08-29 00:23:26 UTC (rev 23320)
@@ -33,7 +33,7 @@
#include "robot_mechanism_controllers/cartesian_twist_controller.h"
#include <algorithm>
-#include "mechanism_control/mechanism_control.h"
+#include "pr2_mechanism_control/mechanism_control.h"
#include "kdl/chainfksolvervel_recursive.hpp"
#include "pluginlib/class_list_macros.h"
Modified: pkg/trunk/sandbox/dallas_controller/src/dallas_controller.cpp
===================================================================
--- pkg/trunk/sandbox/dallas_controller/src/dallas_controller.cpp 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/dallas_controller/src/dallas_controller.cpp 2009-08-29 00:23:26 UTC (rev 23320)
@@ -29,7 +29,7 @@
#include "dallas_controller/dallas_controller.h"
#include "pluginlib/class_list_macros.h"
-#include "controller_interface/controller.h"
+#include "pr2_controller_interface/controller.h"
#include <angles/angles.h>
Modified: pkg/trunk/sandbox/dynamics_estimation/include/dynamics_estimation/dynamics_estimation_node.h
===================================================================
--- pkg/trunk/sandbox/dynamics_estimation/include/dynamics_estimation/dynamics_estimation_node.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/dynamics_estimation/include/dynamics_estimation/dynamics_estimation_node.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -41,9 +41,8 @@
#include <pr2_mechanism_msgs/MechanismState.h>
#include <vector>
#include <dynamics_estimation/trajectory_point.h>
-#include <mechanism_model/robot.h>
-#include <mechanism_model/chain.h>
-#include <hardware_interface/hardware_interface.h>
+#include <pr2_mechanism_model/robot.h>
+#include <pr2_mechanism_model/chain.h>
#include <kdl/chain.hpp>
#include <Eigen/Core>
@@ -96,7 +95,6 @@
std::string bag_file_; /**< Bag file to load trajectory data from */
bool use_bag_file_; /**< Should I load data from a bag file or listen to mechanism_state? */
- HardwareInterface hardware_interface_; /**< Hardware interface, for creating the mechanism_chain_ */
mechanism::Chain mechanism_chain_; /**< Mechanism chain */
KDL::Chain kdl_chain_; /**< KDL chain */
int num_joints_; /**< Number of actuated joints */
Modified: pkg/trunk/sandbox/dynamics_estimation/manifest.xml
===================================================================
--- pkg/trunk/sandbox/dynamics_estimation/manifest.xml 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/dynamics_estimation/manifest.xml 2009-08-29 00:23:26 UTC (rev 23320)
@@ -15,7 +15,6 @@
<depend package="pr2_mechanism_msgs" />
<depend package="kdl" />
<depend package="pr2_mechanism_model" />
- <depend package="pr2_hardware_interface" />
</package>
Modified: pkg/trunk/sandbox/dynamics_estimation/src/dynamics_estimation_node.cpp
===================================================================
--- pkg/trunk/sandbox/dynamics_estimation/src/dynamics_estimation_node.cpp 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/dynamics_estimation/src/dynamics_estimation_node.cpp 2009-08-29 00:23:26 UTC (rev 23320)
@@ -53,7 +53,6 @@
DynamicsEstimationNode::DynamicsEstimationNode():
use_bag_file_(false),
- hardware_interface_(0),
finished_data_collection_(false)
{
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/arm_trajectory_controller.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/arm_trajectory_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/arm_trajectory_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -37,7 +37,7 @@
#include <ros/node.h>
#include <boost/thread/mutex.hpp>
-#include <controller_interface/controller.h>
+#include <pr2_controller_interface/controller.h>
#include <robot_mechanism_controllers/joint_position_controller.h>
#include <robot_mechanism_controllers/joint_velocity_controller.h>
#include <robot_mechanism_controllers/joint_effort_controller.h>
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/cartesian_hybrid_controller.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/cartesian_hybrid_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/cartesian_hybrid_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -32,10 +32,10 @@
#include "ros/node.h"
#include "boost/scoped_ptr.hpp"
-#include "controller_interface/controller.h"
+#include "pr2_controller_interface/controller.h"
#include <kdl/chain.hpp>
#include <kdl/frames.hpp>
-#include "mechanism_model/chain.h"
+#include "pr2_mechanism_model/chain.h"
#include "control_toolbox/pid.h"
#include <tf/transform_listener.h>
#include <tf/message_notifier.h>
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/cartesian_pose_twist_controller.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/cartesian_pose_twist_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/cartesian_pose_twist_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -43,7 +43,7 @@
#include <geometry_msgs/PoseStamped.h>
#include <experimental_controllers/PoseTwistStamped.h>
#include <geometry_msgs/Twist.h>
-#include <controller_interface/controller.h>
+#include <pr2_controller_interface/controller.h>
#include <realtime_tools/realtime_publisher.h>
#include <boost/scoped_ptr.hpp>
#include <robot_mechanism_controllers/cartesian_wrench_controller.h>
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/cartesian_spline_trajectory_controller.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/cartesian_spline_trajectory_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/cartesian_spline_trajectory_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -36,7 +36,7 @@
#include <ros/node.h>
-#include <controller_interface/controller.h>
+#include <pr2_controller_interface/controller.h>
#include <manipulation_msgs/Waypoint.h>
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/cartesian_tff_controller.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/cartesian_tff_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/cartesian_tff_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -41,7 +41,7 @@
#include <ros/node.h>
#include <manipulation_msgs/TaskFrameFormalism.h>
#include <geometry_msgs/Twist.h>
-#include <controller_interface/controller.h>
+#include <pr2_controller_interface/controller.h>
#include <tf/transform_datatypes.h>
#include <control_toolbox/pid.h>
#include <boost/scoped_ptr.hpp>
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/cartesian_trajectory_controller.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/cartesian_trajectory_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/cartesian_trajectory_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -43,7 +43,7 @@
#include <tf/message_notifier.h>
#include <ros/node.h>
#include <geometry_msgs/PoseStamped.h>
-#include <controller_interface/controller.h>
+#include <pr2_controller_interface/controller.h>
#include <robot_mechanism_controllers/cartesian_pose_controller.h>
#include <deprecated_srvs/MoveToPose.h>
#include <std_srvs/Empty.h>
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/cartesian_twist_controller_ik.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/cartesian_twist_controller_ik.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/cartesian_twist_controller_ik.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -43,8 +43,8 @@
#include <kdl/chainiksolver.hpp>
#include <ros/node.h>
#include <geometry_msgs/Twist.h>
-#include <controller_interface/controller.h>
-#include <mechanism_model/chain.h>
+#include <pr2_controller_interface/controller.h>
+#include <pr2_mechanism_model/chain.h>
#include <tf/transform_datatypes.h>
#include <control_toolbox/pid.h>
#include <experimental_controllers/joint_inverse_dynamics_controller.h>
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/caster_controller_effort.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/caster_controller_effort.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/caster_controller_effort.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -41,8 +41,8 @@
#ifndef CASTER_CONTROLLER_EFFORT_H
#define CASTER_CONTROLLER_EFFORT_H
-#include "controller_interface/controller.h"
-#include "mechanism_model/robot.h"
+#include "pr2_controller_interface/controller.h"
+#include "pr2_mechanism_model/robot.h"
#include "control_toolbox/pid.h"
#include "robot_mechanism_controllers/joint_velocity_controller.h"
#include "robot_mechanism_controllers/joint_effort_controller.h"
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/endeffector_constraint_controller.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/endeffector_constraint_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/endeffector_constraint_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -36,7 +36,7 @@
#include <vector>
#include "boost/scoped_ptr.hpp"
-#include "mechanism_model/chain.h"
+#include "pr2_mechanism_model/chain.h"
#include "kdl/chain.hpp"
#include "kdl/frames.hpp"
#include "kdl/chainfksolver.hpp"
@@ -44,7 +44,7 @@
#include "ros/node.h"
#include "geometry_msgs/Wrench.h"
#include "misc_utils/subscription_guard.h"
-#include "controller_interface/controller.h"
+#include "pr2_controller_interface/controller.h"
#include "tf/transform_datatypes.h"
#include "misc_utils/advertised_service_guard.h"
#include "joy/Joy.h"
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/head_servoing_controller.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/head_servoing_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/head_servoing_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -39,7 +39,7 @@
#include <ros/node.h>
#include <ros/node_handle.h>
-#include <controller_interface/controller.h>
+#include <pr2_controller_interface/controller.h>
#include <tf/transform_listener.h>
#include <tf/message_notifier.h>
#include <tf/transform_datatypes.h>
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_autotuner.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_autotuner.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_autotuner.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -46,7 +46,7 @@
#include <ros/node.h>
#include <vector>
-#include <controller_interface/controller.h>
+#include <pr2_controller_interface/controller.h>
#include <control_toolbox/pid.h>
// Services
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_blind_calibration_controller.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_blind_calibration_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_blind_calibration_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -56,7 +56,7 @@
/***************************************************/
-#include "controller_interface/controller.h"
+#include "pr2_controller_interface/controller.h"
#include "robot_mechanism_controllers/joint_velocity_controller.h"
#include "misc_utils/advertised_service_guard.h"
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_calibration_controller.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_calibration_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_calibration_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -58,7 +58,7 @@
/***************************************************/
-#include "mechanism_model/robot.h"
+#include "pr2_mechanism_model/robot.h"
#include "robot_mechanism_controllers/joint_velocity_controller.h"
#include "realtime_tools/realtime_publisher.h"
#include "std_msgs/Empty.h"
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_chain_constraint_controller.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_chain_constraint_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_chain_constraint_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -62,8 +62,8 @@
#include "geometry_msgs/Wrench.h"
#include "experimental_controllers/ChangeConstraints.h"
#include "experimental_controllers/JointConstraint.h"
-#include "controller_interface/controller.h"
-#include "mechanism_model/chain.h"
+#include "pr2_controller_interface/controller.h"
+#include "pr2_mechanism_model/chain.h"
#include "tf/transform_datatypes.h"
#include "misc_utils/advertised_service_guard.h"
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_chain_sine_controller.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_chain_sine_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_chain_sine_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -58,10 +58,10 @@
#ifndef JOINT_CHAIN_SINE_CONTROLLER_H_
#define JOINT_CHAIN_SINE_CONTROLLER_H_
-#include <controller_interface/controller.h>
+#include <pr2_controller_interface/controller.h>
#include <kdl/chain.hpp>
#include <kdl/chainfksolver.hpp>
-#include <mechanism_model/chain.h>
+#include <pr2_mechanism_model/chain.h>
#include <string>
#include <vector>
#include <control_toolbox/sinusoid.h>
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_inverse_dynamics_controller.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_inverse_dynamics_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_inverse_dynamics_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -46,8 +46,8 @@
#include <ros/node.h>
#include <std_msgs/Float64MultiArray.h>
-#include <controller_interface/controller.h>
-#include <mechanism_model/chain.h>
+#include <pr2_controller_interface/controller.h>
+#include <pr2_mechanism_model/chain.h>
#include <tf/transform_datatypes.h>
#include <diagnostic_msgs/DiagnosticArray.h>
#include <realtime_tools/realtime_publisher.h>
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_limit_calibration_controller.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_limit_calibration_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_limit_calibration_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -50,7 +50,7 @@
*/
-#include "mechanism_model/robot.h"
+#include "pr2_mechanism_model/robot.h"
#include "robot_mechanism_controllers/joint_velocity_controller.h"
#include "realtime_tools/realtime_publisher.h"
#include "std_msgs/Empty.h"
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_pd_controller.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_pd_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_pd_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -56,7 +56,7 @@
#include <control_toolbox/pid.h>
#include "misc_utils/advertised_service_guard.h"
#include "misc_utils/subscription_guard.h"
-#include <mechanism_model/robot.h>
+#include <pr2_mechanism_model/robot.h>
// Services
#include <experimental_controllers/SetPDCommand.h>
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_position_smoothing_controller.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_position_smoothing_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_position_smoothing_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -53,7 +53,7 @@
#include <ros/node.h>
-#include <controller_interface/controller.h>
+#include <pr2_controller_interface/controller.h>
#include <control_toolbox/pid.h>
#include "misc_utils/advertised_service_guard.h"
#include "misc_utils/subscription_guard.h"
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_trajectory_controller.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_trajectory_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/joint_trajectory_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -37,7 +37,7 @@
#include <ros/node.h>
#include <boost/thread/mutex.hpp>
-#include <controller_interface/controller.h>
+#include <pr2_controller_interface/controller.h>
#include <experimental_controllers/joint_pd_controller.h>
// Services
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/laser_scanner_qualification.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/laser_scanner_qualification.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/laser_scanner_qualification.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -36,7 +36,7 @@
#include <ros/node.h>
-#include <controller_interface/controller.h>
+#include <pr2_controller_interface/controller.h>
#include <robot_mechanism_controllers/joint_velocity_controller.h>
// Services
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/pid_position_velocity_controller.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/pid_position_velocity_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/pid_position_velocity_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -64,7 +64,7 @@
#include <ros/node_handle.h>
#include <boost/scoped_ptr.hpp>
-#include "controller_interface/controller.h"
+#include "pr2_controller_interface/controller.h"
#include "control_toolbox/pid.h"
#include "control_toolbox/pid_gains_setter.h"
#include "misc_utils/advertised_service_guard.h"
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/plug_controller.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/plug_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/plug_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -36,7 +36,7 @@
#include <vector>
#include "boost/scoped_ptr.hpp"
-#include "mechanism_model/chain.h"
+#include "pr2_mechanism_model/chain.h"
#include "kdl/chain.hpp"
#include "kdl/frames.hpp"
#include "kdl/chainfksolver.hpp"
@@ -49,7 +49,7 @@
#include "robot_srvs/SetPoseStamped.h"
#include "control_toolbox/pid.h"
#include "misc_utils/subscription_guard.h"
-#include "controller_interface/controller.h"
+#include "pr2_controller_interface/controller.h"
#include "tf/transform_datatypes.h"
#include "tf/transform_listener.h"
#include "misc_utils/advertised_service_guard.h"
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/pr2_gripper_controller.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/pr2_gripper_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/pr2_gripper_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -36,8 +36,8 @@
*/
#include <ros/node.h>
-#include <mechanism_model/robot.h>
-#include <controller_interface/controller.h>
+#include <pr2_mechanism_model/robot.h>
+#include <pr2_controller_interface/controller.h>
#include <robot_mechanism_controllers/joint_effort_controller.h>
#include <experimental_controllers/GripperControllerCmd.h>
#include <pr2_msgs/GripperControllerState.h>
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/probe.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/probe.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/probe.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -35,7 +35,7 @@
#define PROBE_CONTROLLER_H
#include <ros/node_handle.h>
-#include <controller_interface/controller.h>
+#include <pr2_controller_interface/controller.h>
#include <robot_mechanism_controllers/JointControllerState.h>
#include <experimental_controllers/JointTuningMsg.h>
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/trajectory_controller.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/trajectory_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/trajectory_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -36,7 +36,7 @@
#include <ros/node.h>
-#include <controller_interface/controller.h>
+#include <pr2_controller_interface/controller.h>
#include <manipulation_msgs/Waypoint.h>
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 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/src/cartesian_pose_twist_controller.cpp 2009-08-29 00:23:26 UTC (rev 23320)
@@ -34,7 +34,7 @@
#include <algorithm>
-#include <mechanism_control/mechanism_control.h>
+#include <pr2_mechanism_control/mechanism_control.h>
#include "kdl/chainfksolverpos_recursive.hpp"
#include "experimental_controllers/cartesian_pose_twist_controller.h"
#include "kdl/chainfksolvervel_recursive.hpp"
Modified: pkg/trunk/sandbox/experimental_controllers/src/cartesian_tff_controller.cpp
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/src/cartesian_tff_controller.cpp 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/src/cartesian_tff_controller.cpp 2009-08-29 00:23:26 UTC (rev 23320)
@@ -33,7 +33,7 @@
#include "experimental_controllers/cartesian_tff_controller.h"
#include <algorithm>
-#include <mechanism_control/mechanism_control.h>
+#include <pr2_mechanism_control/mechanism_control.h>
#include <kdl/chainfksolvervel_recursive.hpp>
#include "pluginlib/class_list_macros.h"
Modified: pkg/trunk/sandbox/experimental_controllers/src/cartesian_trajectory_controller.cpp
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/src/cartesian_trajectory_controller.cpp 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/src/cartesian_trajectory_controller.cpp 2009-08-29 00:23:26 UTC (rev 23320)
@@ -34,7 +34,7 @@
#include <algorithm>
-#include <mechanism_control/mechanism_control.h>
+#include <pr2_mechanism_control/mechanism_control.h>
#include "kdl/chainfksolverpos_recursive.hpp"
#include "experimental_controllers/cartesian_trajectory_controller.h"
#include "pluginlib/class_list_macros.h"
Modified: pkg/trunk/sandbox/experimental_controllers/src/cartesian_twist_controller_ik.cpp
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/src/cartesian_twist_controller_ik.cpp 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/src/cartesian_twist_controller_ik.cpp 2009-08-29 00:23:26 UTC (rev 23320)
@@ -34,7 +34,7 @@
#include <experimental_controllers/cartesian_twist_controller_ik.h>
#include <algorithm>
-#include <mechanism_control/mechanism_control.h>
+#include <pr2_mechanism_control/mechanism_control.h>
#include "pluginlib/class_list_macros.h"
#include <kdl/chainfksolvervel_recursive.hpp>
Modified: pkg/trunk/sandbox/experimental_controllers/src/head_servoing_controller.cpp
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/src/head_servoing_controller.cpp 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/experimental_controllers/src/head_servoing_controller.cpp 2009-08-29 00:23:26 UTC (rev 23320)
@@ -35,7 +35,7 @@
// Original version: Melonee Wise <mw...@wi...>
#include <experimental_controllers/head_servoing_controller.h>
-#include <mechanism_control/mechanism_control.h>
+#include <pr2_mechanism_control/mechanism_control.h>
#include <cmath>
#include <angles/angles.h>
#include "pluginlib/class_list_macros.h"
Modified: pkg/trunk/sandbox/mechanism_control_test/include/mechanism_controller_test/null_hardware.h
===================================================================
--- pkg/trunk/sandbox/mechanism_control_test/include/mechanism_controller_test/null_hardware.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/mechanism_control_test/include/mechanism_controller_test/null_hardware.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -1,7 +1,7 @@
#ifndef NULL_HARDWARE_H
#define NULL_HARDWARE_H
-#include <hardware_interface/hardware_interface.h>
+#include <pr2_hardware_interface/hardware_interface.h>
#include <tinyxml/tinyxml.h>
class NullHardware
Modified: pkg/trunk/sandbox/mechanism_control_test/src/mechanism_controller_test.cpp
===================================================================
--- pkg/trunk/sandbox/mechanism_control_test/src/mechanism_controller_test.cpp 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/mechanism_control_test/src/mechanism_controller_test.cpp 2009-08-29 00:23:26 UTC (rev 23320)
@@ -34,8 +34,8 @@
#include <fcntl.h>
#include <ros/node_handle.h>
-#include <mechanism_controller_test/null_hardware.h>
-#include <mechanism_control/mechanism_control.h>
+#include <pr2_mechanism_controller_test/null_hardware.h>
+#include <pr2_mechanism_control/mechanism_control.h>
static struct
Modified: pkg/trunk/sandbox/mechanism_control_test/src/null_hardware.cpp
===================================================================
--- pkg/trunk/sandbox/mechanism_control_test/src/null_hardware.cpp 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/mechanism_control_test/src/null_hardware.cpp 2009-08-29 00:23:26 UTC (rev 23320)
@@ -1,4 +1,4 @@
-#include <mechanism_controller_test/null_hardware.h>
+#include <pr2_mechanism_controller_test/null_hardware.h>
NullHardware::NullHardware(){
hw_ = new HardwareInterface(0);
Modified: pkg/trunk/sandbox/pr2_gripper_controller/include/pr2_gripper_controller/pr2_gripper_controller.h
===================================================================
--- pkg/trunk/sandbox/pr2_gripper_controller/include/pr2_gripper_controller/pr2_gripper_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/pr2_gripper_controller/include/pr2_gripper_controller/pr2_gripper_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -36,7 +36,7 @@
*/
#include <ros/node.h>
-#include <mechanism_model/robot.h>
+#include <pr2_mechanism_model/robot.h>
#include <controller_interface/controller.h>
#include <robot_mechanism_controllers/joint_effort_controller.h>
#include <pr2_mechanism_controllers/GripperControllerCmd.h>
Modified: pkg/trunk/sandbox/qualification_controllers/joint_qualification_controllers/include/joint_qualification_controllers/checkout_controller.h
===================================================================
--- pkg/trunk/sandbox/qualification_controllers/joint_qualification_controllers/include/joint_qualification_controllers/checkout_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/qualification_controllers/joint_qualification_controllers/include/joint_qualification_controllers/checkout_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -52,7 +52,7 @@
#include <math.h>
#include <joint_qualification_controllers/RobotData.h>
#include <realtime_tools/realtime_srv_call.h>
-#include <controller_interface/controller.h>
+#include <pr2_controller_interface/controller.h>
#include <boost/scoped_ptr.hpp>
namespace controller
Modified: pkg/trunk/sandbox/qualification_controllers/joint_qualification_controllers/include/joint_qualification_controllers/hold_set_controller.h
===================================================================
--- pkg/trunk/sandbox/qualification_controllers/joint_qualification_controllers/include/joint_qualification_controllers/hold_set_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/qualification_controllers/joint_qualification_controllers/include/joint_qualification_controllers/hold_set_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -50,7 +50,7 @@
#include <math.h>
#include <joint_qualification_controllers/HoldSetData.h>
#include <realtime_tools/realtime_srv_call.h>
-#include <controller_interface/controller.h>
+#include <pr2_controller_interface/controller.h>
#include <robot_mechanism_controllers/joint_position_controller.h>
#include <control_toolbox/dither.h>
Modified: pkg/trunk/sandbox/qualification_controllers/joint_qualification_controllers/include/joint_qualification_controllers/hysteresis_controller.h
===================================================================
--- pkg/trunk/sandbox/qualification_controllers/joint_qualification_controllers/include/joint_qualification_controllers/hysteresis_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/qualification_controllers/joint_qualification_controllers/include/joint_qualification_controllers/hysteresis_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -49,7 +49,7 @@
#include <math.h>
#include <joint_qualification_controllers/TestData.h>
#include <realtime_tools/realtime_srv_call.h>
-#include <controller_interface/controller.h>
+#include <pr2_controller_interface/controller.h>
#include <robot_mechanism_controllers/joint_velocity_controller.h>
#include <boost/scoped_ptr.hpp>
Modified: pkg/trunk/sandbox/qualification_controllers/joint_qualification_controllers/include/joint_qualification_controllers/sine_sweep_controller.h
===================================================================
--- pkg/trunk/sandbox/qualification_controllers/joint_qualification_controllers/include/joint_qualification_controllers/sine_sweep_controller.h 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/qualification_controllers/joint_qualification_controllers/include/joint_qualification_controllers/sine_sweep_controller.h 2009-08-29 00:23:26 UTC (rev 23320)
@@ -47,7 +47,7 @@
#include <math.h>
#include <joint_qualification_controllers/TestData.h>
#include <realtime_tools/realtime_srv_call.h>
-#include <controller_interface/controller.h>
+#include <pr2_controller_interface/controller.h>
#include <control_toolbox/sine_sweep.h>
#include <boost/scoped_ptr.hpp>
Modified: pkg/trunk/sandbox/rtt_controller/src/pr2_etherCAT_component.cpp
===================================================================
--- pkg/trunk/sandbox/rtt_controller/src/pr2_etherCAT_component.cpp 2009-08-29 00:22:31 UTC (rev 23319)
+++ pkg/trunk/sandbox/rtt_controller/src/pr2_etherCAT_component.cpp 2009-08-29 00:23:26 UTC (rev 23320)
@@ -1,7 +1,7 @@
#include <rtt/TaskContext.hpp>
#include <rtt/Ports.hpp>
-#include <mechanism_control/mechanism_control.h>
+#include <pr2_mechanism_control/mechanism_control.h>
#include <ethercat_hardware/ethercat_hardware.h>
#include <ocl/ComponentLoader.hpp>
Modified: pkg/trunk/sandbox/trajectory_controllers/include/trajectory_controllers/joint_trajectory_controller2.h...
[truncated message content] |
