Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[19609] pkg/trunk
|
From: <mee...@us...> - 2009-07-24 20:52:02
|
Revision: 19609
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=19609&view=rev
Author: meeussen
Date: 2009-07-24 20:51:46 +0000 (Fri, 24 Jul 2009)
Log Message:
-----------
move movetopose service from robot srvs to deprecated srvs
Modified Paths:
--------------
pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/cartesian_trajectory_controller.h
pkg/trunk/controllers/robot_mechanism_controllers/manifest.xml
pkg/trunk/controllers/robot_mechanism_controllers/src/cartesian_trajectory_controller.cpp
pkg/trunk/demos/plug_in/move_to_pickup.py
pkg/trunk/demos/plug_in/plug_in.py
pkg/trunk/demos/plug_in/plug_in2.py
pkg/trunk/highlevel/doors/doors_core/include/doors_core/action_grasp_handle.h
pkg/trunk/highlevel/doors/doors_core/include/doors_core/action_open_door.h
pkg/trunk/highlevel/doors/doors_core/include/doors_core/action_push_door.h
pkg/trunk/highlevel/doors/doors_core/include/doors_core/action_release_handle.h
pkg/trunk/highlevel/doors/doors_core/include/doors_core/action_touch_door.h
pkg/trunk/highlevel/doors/doors_core/include/doors_core/action_unlatch_handle.h
pkg/trunk/highlevel/doors/doors_core/manifest.xml
pkg/trunk/highlevel/plugs/plugs_core/include/plugs_core/action_localize_plug_in_gripper.h
pkg/trunk/highlevel/plugs/plugs_core/include/plugs_core/action_move_and_grasp_plug.h
pkg/trunk/highlevel/plugs/plugs_core/include/plugs_core/action_stow_plug.h
pkg/trunk/highlevel/plugs/plugs_core/manifest.xml
Added Paths:
-----------
pkg/trunk/deprecated/deprecated_srvs/MoveToPose.srv
Removed Paths:
-------------
pkg/trunk/stacks/common_msgs/robot_srvs/srv/MoveToPose.srv
Modified: pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/cartesian_trajectory_controller.h
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/cartesian_trajectory_controller.h 2009-07-24 20:41:39 UTC (rev 19608)
+++ pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/cartesian_trajectory_controller.h 2009-07-24 20:51:46 UTC (rev 19609)
@@ -45,7 +45,7 @@
#include <robot_msgs/PoseStamped.h>
#include <mechanism_model/controller.h>
#include <robot_mechanism_controllers/cartesian_pose_controller.h>
-#include <robot_srvs/MoveToPose.h>
+#include <deprecated_srvs/MoveToPose.h>
#include <std_srvs/Empty.h>
#include <boost/scoped_ptr.hpp>
@@ -73,7 +73,7 @@
void command(const tf::MessageNotifier<robot_msgs::PoseStamped>::MessagePtr& pose_msg);
// service calls
- bool moveTo(robot_srvs::MoveToPose::Request &req, robot_srvs::MoveToPose::Response &resp);
+ bool moveTo(deprecated_srvs::MoveToPose::Request &req, deprecated_srvs::MoveToPose::Response &resp);
bool preempt(std_srvs::Empty::Request &req, std_srvs::Empty::Response &resp);
ros::Node* node_;
Modified: pkg/trunk/controllers/robot_mechanism_controllers/manifest.xml
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/manifest.xml 2009-07-24 20:41:39 UTC (rev 19608)
+++ pkg/trunk/controllers/robot_mechanism_controllers/manifest.xml 2009-07-24 20:51:46 UTC (rev 19609)
@@ -15,6 +15,7 @@
<depend package="roscpp" />
<depend package="std_msgs" />
<depend package="robot_srvs" />
+ <depend package="deprecated_srvs" />
<depend package="robot_msgs" />
<depend package="manipulation_msgs" />
<depend package="visualization_msgs" />
Modified: pkg/trunk/controllers/robot_mechanism_controllers/src/cartesian_trajectory_controller.cpp
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/src/cartesian_trajectory_controller.cpp 2009-07-24 20:41:39 UTC (rev 19608)
+++ pkg/trunk/controllers/robot_mechanism_controllers/src/cartesian_trajectory_controller.cpp 2009-07-24 20:51:46 UTC (rev 19609)
@@ -284,8 +284,8 @@
}
-bool CartesianTrajectoryController::moveTo(robot_srvs::MoveToPose::Request &req,
- robot_srvs::MoveToPose::Response &resp)
+bool CartesianTrajectoryController::moveTo(deprecated_srvs::MoveToPose::Request &req,
+ deprecated_srvs::MoveToPose::Response &resp)
{
ROS_INFO("in cartesian traj move_to service");
if (!moveTo(req.pose, req.tolerance, 0.0)){
Modified: pkg/trunk/demos/plug_in/move_to_pickup.py
===================================================================
--- pkg/trunk/demos/plug_in/move_to_pickup.py 2009-07-24 20:41:39 UTC (rev 19608)
+++ pkg/trunk/demos/plug_in/move_to_pickup.py 2009-07-24 20:51:46 UTC (rev 19609)
@@ -15,6 +15,7 @@
from pr2_mechanism_controllers.srv import *
from std_msgs.msg import *
from robot_srvs.srv import *
+from deprecated_srvs.srv import *
import sys
from time import sleep
Modified: pkg/trunk/demos/plug_in/plug_in.py
===================================================================
--- pkg/trunk/demos/plug_in/plug_in.py 2009-07-24 20:41:39 UTC (rev 19608)
+++ pkg/trunk/demos/plug_in/plug_in.py 2009-07-24 20:51:46 UTC (rev 19609)
@@ -35,6 +35,7 @@
import rospy
from robot_msgs.msg import *
from robot_srvs.srv import *
+from deprecated_srvs.srv import *
CONTROLLER = 'arm_constraint'
Modified: pkg/trunk/demos/plug_in/plug_in2.py
===================================================================
--- pkg/trunk/demos/plug_in/plug_in2.py 2009-07-24 20:41:39 UTC (rev 19608)
+++ pkg/trunk/demos/plug_in/plug_in2.py 2009-07-24 20:51:46 UTC (rev 19609)
@@ -36,6 +36,7 @@
import rospy
from robot_msgs.msg import *
from robot_srvs.srv import *
+from deprecated_srvs.srv import *
import tf.transformations
import tf
Copied: pkg/trunk/deprecated/deprecated_srvs/MoveToPose.srv (from rev 19605, pkg/trunk/stacks/common_msgs/robot_srvs/srv/MoveToPose.srv)
===================================================================
--- pkg/trunk/deprecated/deprecated_srvs/MoveToPose.srv (rev 0)
+++ pkg/trunk/deprecated/deprecated_srvs/MoveToPose.srv 2009-07-24 20:51:46 UTC (rev 19609)
@@ -0,0 +1,3 @@
+robot_msgs/PoseStamped pose
+robot_msgs/Twist tolerance
+---
Property changes on: pkg/trunk/deprecated/deprecated_srvs/MoveToPose.srv
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/common/robot_srvs/srv/MoveToPose.srv:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Modified: pkg/trunk/highlevel/doors/doors_core/include/doors_core/action_grasp_handle.h
===================================================================
--- pkg/trunk/highlevel/doors/doors_core/include/doors_core/action_grasp_handle.h 2009-07-24 20:41:39 UTC (rev 19608)
+++ pkg/trunk/highlevel/doors/doors_core/include/doors_core/action_grasp_handle.h 2009-07-24 20:51:46 UTC (rev 19609)
@@ -46,7 +46,7 @@
#include <std_srvs/Empty.h>
#include <tf/tf.h>
#include <tf/transform_listener.h>
-#include <robot_srvs/MoveToPose.h>
+#include <deprecated_srvs/MoveToPose.h>
#include <kdl/frames.hpp>
#include <robot_actions/action.h>
@@ -66,8 +66,8 @@
tf::TransformListener& tf_;
- robot_srvs::MoveToPose::Request req_moveto;
- robot_srvs::MoveToPose::Response res_moveto;
+ deprecated_srvs::MoveToPose::Request req_moveto;
+ deprecated_srvs::MoveToPose::Response res_moveto;
};
}
Modified: pkg/trunk/highlevel/doors/doors_core/include/doors_core/action_open_door.h
===================================================================
--- pkg/trunk/highlevel/doors/doors_core/include/doors_core/action_open_door.h 2009-07-24 20:41:39 UTC (rev 19608)
+++ pkg/trunk/highlevel/doors/doors_core/include/doors_core/action_open_door.h 2009-07-24 20:51:46 UTC (rev 19609)
@@ -42,7 +42,7 @@
#include <manipulation_msgs/TaskFrameFormalism.h>
#include <tf/tf.h>
#include <tf/transform_listener.h>
-#include <robot_srvs/MoveToPose.h>
+#include <deprecated_srvs/MoveToPose.h>
#include <kdl/frames.hpp>
#include <robot_actions/action.h>
#include <boost/thread/mutex.hpp>
Modified: pkg/trunk/highlevel/doors/doors_core/include/doors_core/action_push_door.h
===================================================================
--- pkg/trunk/highlevel/doors/doors_core/include/doors_core/action_push_door.h 2009-07-24 20:41:39 UTC (rev 19608)
+++ pkg/trunk/highlevel/doors/doors_core/include/doors_core/action_push_door.h 2009-07-24 20:51:46 UTC (rev 19609)
@@ -46,7 +46,7 @@
#include <std_srvs/Empty.h>
#include <tf/tf.h>
#include <tf/transform_listener.h>
-#include <robot_srvs/MoveToPose.h>
+#include <deprecated_srvs/MoveToPose.h>
#include <kdl/frames.hpp>
#include <robot_actions/action.h>
#include <boost/thread/mutex.hpp>
Modified: pkg/trunk/highlevel/doors/doors_core/include/doors_core/action_release_handle.h
===================================================================
--- pkg/trunk/highlevel/doors/doors_core/include/doors_core/action_release_handle.h 2009-07-24 20:41:39 UTC (rev 19608)
+++ pkg/trunk/highlevel/doors/doors_core/include/doors_core/action_release_handle.h 2009-07-24 20:51:46 UTC (rev 19609)
@@ -46,7 +46,7 @@
#include <std_srvs/Empty.h>
#include <tf/tf.h>
#include <tf/transform_listener.h>
-#include <robot_srvs/MoveToPose.h>
+#include <deprecated_srvs/MoveToPose.h>
#include <kdl/frames.hpp>
#include <robot_actions/action.h>
#include <boost/thread/mutex.hpp>
@@ -78,8 +78,8 @@
std_srvs::Empty::Request req_empty;
std_srvs::Empty::Response res_empty;
- robot_srvs::MoveToPose::Request req_moveto;
- robot_srvs::MoveToPose::Response res_moveto;
+ deprecated_srvs::MoveToPose::Request req_moveto;
+ deprecated_srvs::MoveToPose::Response res_moveto;
};
}
Modified: pkg/trunk/highlevel/doors/doors_core/include/doors_core/action_touch_door.h
===================================================================
--- pkg/trunk/highlevel/doors/doors_core/include/doors_core/action_touch_door.h 2009-07-24 20:41:39 UTC (rev 19608)
+++ pkg/trunk/highlevel/doors/doors_core/include/doors_core/action_touch_door.h 2009-07-24 20:51:46 UTC (rev 19609)
@@ -46,7 +46,7 @@
#include <std_srvs/Empty.h>
#include <tf/tf.h>
#include <tf/transform_listener.h>
-#include <robot_srvs/MoveToPose.h>
+#include <deprecated_srvs/MoveToPose.h>
#include <kdl/frames.hpp>
#include <robot_actions/action.h>
@@ -65,8 +65,8 @@
ros::Publisher pub_;
tf::TransformListener& tf_;
- robot_srvs::MoveToPose::Request req_moveto;
- robot_srvs::MoveToPose::Response res_moveto;
+ deprecated_srvs::MoveToPose::Request req_moveto;
+ deprecated_srvs::MoveToPose::Response res_moveto;
};
}
Modified: pkg/trunk/highlevel/doors/doors_core/include/doors_core/action_unlatch_handle.h
===================================================================
--- pkg/trunk/highlevel/doors/doors_core/include/doors_core/action_unlatch_handle.h 2009-07-24 20:41:39 UTC (rev 19608)
+++ pkg/trunk/highlevel/doors/doors_core/include/doors_core/action_unlatch_handle.h 2009-07-24 20:51:46 UTC (rev 19609)
@@ -42,7 +42,7 @@
#include <manipulation_msgs/TaskFrameFormalism.h>
#include <tf/tf.h>
#include <tf/transform_listener.h>
-#include <robot_srvs/MoveToPose.h>
+#include <deprecated_srvs/MoveToPose.h>
#include <kdl/frames.hpp>
#include <robot_actions/action.h>
#include <boost/thread/mutex.hpp>
Modified: pkg/trunk/highlevel/doors/doors_core/manifest.xml
===================================================================
--- pkg/trunk/highlevel/doors/doors_core/manifest.xml 2009-07-24 20:41:39 UTC (rev 19608)
+++ pkg/trunk/highlevel/doors/doors_core/manifest.xml 2009-07-24 20:51:46 UTC (rev 19609)
@@ -18,6 +18,7 @@
<depend package="visualization_msgs"/>
<depend package="robot_srvs" />
+ <depend package="deprecated_srvs" />
<depend package="nav_srvs" />
<depend package="robot_actions" />
Modified: pkg/trunk/highlevel/plugs/plugs_core/include/plugs_core/action_localize_plug_in_gripper.h
===================================================================
--- pkg/trunk/highlevel/plugs/plugs_core/include/plugs_core/action_localize_plug_in_gripper.h 2009-07-24 20:41:39 UTC (rev 19608)
+++ pkg/trunk/highlevel/plugs/plugs_core/include/plugs_core/action_localize_plug_in_gripper.h 2009-07-24 20:51:46 UTC (rev 19609)
@@ -47,7 +47,7 @@
#include <std_msgs/Float64.h>
// Srvs
-#include <robot_srvs/MoveToPose.h>
+#include <deprecated_srvs/MoveToPose.h>
#include "robot_srvs/SetPoseStamped.h"
//TF
#include <tf/tf.h>
@@ -96,8 +96,8 @@
tf::Stamped<tf::Pose> plug_pose_;
- robot_srvs::MoveToPose::Request req_pose_;
- robot_srvs::MoveToPose::Response res_pose_;
+ deprecated_srvs::MoveToPose::Request req_pose_;
+ deprecated_srvs::MoveToPose::Response res_pose_;
};
Modified: pkg/trunk/highlevel/plugs/plugs_core/include/plugs_core/action_move_and_grasp_plug.h
===================================================================
--- pkg/trunk/highlevel/plugs/plugs_core/include/plugs_core/action_move_and_grasp_plug.h 2009-07-24 20:41:39 UTC (rev 19608)
+++ pkg/trunk/highlevel/plugs/plugs_core/include/plugs_core/action_move_and_grasp_plug.h 2009-07-24 20:51:46 UTC (rev 19609)
@@ -48,7 +48,7 @@
#include <std_msgs/Float64.h>
// Srvs
-#include <robot_srvs/MoveToPose.h>
+#include <deprecated_srvs/MoveToPose.h>
// Robot Action Stuff
#include <robot_actions/action.h>
@@ -82,8 +82,8 @@
plugs_msgs::PlugStow plug_stow_;
- robot_srvs::MoveToPose::Request req_pose_;
- robot_srvs::MoveToPose::Response res_pose_;
+ deprecated_srvs::MoveToPose::Request req_pose_;
+ deprecated_srvs::MoveToPose::Response res_pose_;
robot_mechanism_controllers::JointControllerState controller_state_msg_;
Modified: pkg/trunk/highlevel/plugs/plugs_core/include/plugs_core/action_stow_plug.h
===================================================================
--- pkg/trunk/highlevel/plugs/plugs_core/include/plugs_core/action_stow_plug.h 2009-07-24 20:41:39 UTC (rev 19608)
+++ pkg/trunk/highlevel/plugs/plugs_core/include/plugs_core/action_stow_plug.h 2009-07-24 20:51:46 UTC (rev 19609)
@@ -48,7 +48,7 @@
#include <std_msgs/Float64.h>
// Srvs
-#include <robot_srvs/MoveToPose.h>
+#include <deprecated_srvs/MoveToPose.h>
// Robot Action Stuff
#include <robot_actions/action.h>
@@ -82,8 +82,8 @@
plugs_msgs::PlugStow plug_stow_;
- robot_srvs::MoveToPose::Request req_pose_;
- robot_srvs::MoveToPose::Response res_pose_;
+ deprecated_srvs::MoveToPose::Request req_pose_;
+ deprecated_srvs::MoveToPose::Response res_pose_;
robot_mechanism_controllers::JointControllerState controller_state_msg_;
Modified: pkg/trunk/highlevel/plugs/plugs_core/manifest.xml
===================================================================
--- pkg/trunk/highlevel/plugs/plugs_core/manifest.xml 2009-07-24 20:41:39 UTC (rev 19608)
+++ pkg/trunk/highlevel/plugs/plugs_core/manifest.xml 2009-07-24 20:51:46 UTC (rev 19609)
@@ -11,6 +11,7 @@
<depend package="roscpp" />
<depend package="robot_msgs" />
<depend package="robot_srvs" />
+ <depend package="deprecated_srvs" />
<depend package="mechanism_msgs" />
<depend package="std_msgs" />
<depend package="robot_actions" />
Deleted: pkg/trunk/stacks/common_msgs/robot_srvs/srv/MoveToPose.srv
===================================================================
--- pkg/trunk/stacks/common_msgs/robot_srvs/srv/MoveToPose.srv 2009-07-24 20:41:39 UTC (rev 19608)
+++ pkg/trunk/stacks/common_msgs/robot_srvs/srv/MoveToPose.srv 2009-07-24 20:51:46 UTC (rev 19609)
@@ -1,3 +0,0 @@
-robot_msgs/PoseStamped pose
-robot_msgs/Twist tolerance
----
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
