Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[22546] pkg/trunk
|
From: <ehb...@us...> - 2009-08-21 16:04:06
|
Revision: 22546
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=22546&view=rev
Author: ehberger
Date: 2009-08-21 16:03:38 +0000 (Fri, 21 Aug 2009)
Log Message:
-----------
moving pr2_srvs into pr2_msgs
Modified Paths:
--------------
pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/laser_scanner_traj_controller.h
pkg/trunk/controllers/pr2_mechanism_controllers/manifest.xml
pkg/trunk/controllers/pr2_mechanism_controllers/scripts/send_laser_traj_cmd_ms2.py
pkg/trunk/controllers/pr2_mechanism_controllers/scripts/send_periodic_cmd_srv.py
pkg/trunk/controllers/pr2_mechanism_controllers/src/laser_scanner_traj_controller.cpp
pkg/trunk/highlevel/safety/safety_core/include/safety_core/action_detect_plug_on_base.h
pkg/trunk/highlevel/safety/safety_core/manifest.xml
pkg/trunk/sandbox/pr2_robot_actions/manifest.xml
pkg/trunk/sandbox/pr2_robot_actions/src/set_laser_tilt.cpp
pkg/trunk/stacks/laser_drivers/point_cloud_assembler/manifest.xml
pkg/trunk/stacks/laser_drivers/point_cloud_assembler/src/point_cloud_srv.cpp
pkg/trunk/stacks/pr2_common/pr2_msgs/CMakeLists.txt
pkg/trunk/stacks/pr2_common/pr2_msgs/manifest.xml
Added Paths:
-----------
pkg/trunk/stacks/pr2_common/pr2_msgs/srv/
Removed Paths:
-------------
pkg/trunk/stacks/pr2_common/pr2_srvs/
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-21 15:58:42 UTC (rev 22545)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/laser_scanner_traj_controller.h 2009-08-21 16:03:38 UTC (rev 22546)
@@ -53,8 +53,8 @@
// Services
#include <pr2_mechanism_controllers/SetProfile.h>
-#include <pr2_srvs/SetPeriodicCmd.h>
-#include <pr2_srvs/SetLaserTrajCmd.h>
+#include <pr2_msgs/SetPeriodicCmd.h>
+#include <pr2_msgs/SetLaserTrajCmd.h>
#include "boost/thread/mutex.hpp"
#include "trajectory/trajectory.h"
@@ -140,10 +140,10 @@
void setPeriodicCmd() ;
void setTrajCmd() ;
//void setTrackLinkCmd() ;
- bool setPeriodicSrv(pr2_srvs::SetPeriodicCmd::Request &req,
- pr2_srvs::SetPeriodicCmd::Response &res);
- bool setTrajSrv(pr2_srvs::SetLaserTrajCmd::Request &req,
- pr2_srvs::SetLaserTrajCmd::Response &res);
+ bool setPeriodicSrv(pr2_msgs::SetPeriodicCmd::Request &req,
+ pr2_msgs::SetPeriodicCmd::Response &res);
+ bool setTrajSrv(pr2_msgs::SetLaserTrajCmd::Request &req,
+ pr2_msgs::SetLaserTrajCmd::Response &res);
private:
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/manifest.xml
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/manifest.xml 2009-08-21 15:58:42 UTC (rev 22545)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/manifest.xml 2009-08-21 16:03:38 UTC (rev 22546)
@@ -18,7 +18,6 @@
<depend package="mechanism_msgs" />
<depend package="nav_msgs" />
<depend package="pr2_msgs" />
- <depend package="pr2_srvs"/>
<depend package="visualization_msgs" />
<depend package="robot_actions" />
<depend package="rosconsole" />
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/scripts/send_laser_traj_cmd_ms2.py
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/scripts/send_laser_traj_cmd_ms2.py 2009-08-21 15:58:42 UTC (rev 22545)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/scripts/send_laser_traj_cmd_ms2.py 2009-08-21 16:03:38 UTC (rev 22546)
@@ -12,7 +12,7 @@
from std_msgs import *
from pr2_msgs.msg import LaserTrajCmd
-from pr2_srvs.srv import *
+from pr2_msgs.srv import *
from time import sleep
def print_usage(exit_code = 0):
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/scripts/send_periodic_cmd_srv.py
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/scripts/send_periodic_cmd_srv.py 2009-08-21 15:58:42 UTC (rev 22545)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/scripts/send_periodic_cmd_srv.py 2009-08-21 16:03:38 UTC (rev 22546)
@@ -12,7 +12,7 @@
from std_msgs import *
from pr2_msgs.msg import PeriodicCmd
-from pr2_srvs.srv import *
+from pr2_msgs.srv import *
from time import sleep
def print_usage(exit_code = 0):
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/src/laser_scanner_traj_controller.cpp
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/src/laser_scanner_traj_controller.cpp 2009-08-21 15:58:42 UTC (rev 22545)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/src/laser_scanner_traj_controller.cpp 2009-08-21 16:03:38 UTC (rev 22546)
@@ -536,8 +536,8 @@
}
-bool LaserScannerTrajControllerNode::setPeriodicSrv(pr2_srvs::SetPeriodicCmd::Request &req,
- pr2_srvs::SetPeriodicCmd::Response &res)
+bool LaserScannerTrajControllerNode::setPeriodicSrv(pr2_msgs::SetPeriodicCmd::Request &req,
+ pr2_msgs::SetPeriodicCmd::Response &res)
{
ROS_INFO("LaserScannerTrajControllerNode: set periodic command");
@@ -557,8 +557,8 @@
prev_profile_segment_ = -1 ;
}
-bool LaserScannerTrajControllerNode::setTrajSrv(pr2_srvs::SetLaserTrajCmd::Request &req,
- pr2_srvs::SetLaserTrajCmd::Response &res)
+bool LaserScannerTrajControllerNode::setTrajSrv(pr2_msgs::SetLaserTrajCmd::Request &req,
+ pr2_msgs::SetLaserTrajCmd::Response &res)
{
ROS_INFO("LaserScannerTrajControllerNode: set traj command");
Modified: pkg/trunk/highlevel/safety/safety_core/include/safety_core/action_detect_plug_on_base.h
===================================================================
--- pkg/trunk/highlevel/safety/safety_core/include/safety_core/action_detect_plug_on_base.h 2009-08-21 15:58:42 UTC (rev 22545)
+++ pkg/trunk/highlevel/safety/safety_core/include/safety_core/action_detect_plug_on_base.h 2009-08-21 16:03:38 UTC (rev 22546)
@@ -41,7 +41,7 @@
#include <ros/node.h>
#include <plugs_msgs/PlugStow.h>
-#include <pr2_srvs/SetPeriodicCmd.h>
+#include <pr2_msgs/SetPeriodicCmd.h>
#include <std_msgs/Empty.h>
#include <robot_actions/action.h>
#include <plug_onbase_detector/plug_onbase_detector.h>
@@ -86,8 +86,8 @@
double std_y_;
double std_z_;
- pr2_srvs::SetPeriodicCmd::Request req_laser_;
- pr2_srvs::SetPeriodicCmd::Response res_laser_;
+ pr2_msgs::SetPeriodicCmd::Request req_laser_;
+ pr2_msgs::SetPeriodicCmd::Response res_laser_;
};
}
Modified: pkg/trunk/highlevel/safety/safety_core/manifest.xml
===================================================================
--- pkg/trunk/highlevel/safety/safety_core/manifest.xml 2009-08-21 15:58:42 UTC (rev 22545)
+++ pkg/trunk/highlevel/safety/safety_core/manifest.xml 2009-08-21 16:03:38 UTC (rev 22546)
@@ -13,7 +13,6 @@
<depend package="pr2_robot_actions" />
<depend package="plug_onbase_detector" />
<depend package="std_msgs" />
- <depend package="pr2_srvs" />
<depend package="pr2_mechanism_controllers"/>
<depend package="experimental_controllers" />
<depend package="plugs_msgs"/>
Modified: pkg/trunk/sandbox/pr2_robot_actions/manifest.xml
===================================================================
--- pkg/trunk/sandbox/pr2_robot_actions/manifest.xml 2009-08-21 15:58:42 UTC (rev 22545)
+++ pkg/trunk/sandbox/pr2_robot_actions/manifest.xml 2009-08-21 16:03:38 UTC (rev 22546)
@@ -11,7 +11,6 @@
<depend package="geometry_msgs"/>
<depend package="door_msgs"/>
<depend package="pr2_msgs"/>
- <depend package="pr2_srvs"/>
<depend package="plugs_msgs"/>
<export>
Modified: pkg/trunk/sandbox/pr2_robot_actions/src/set_laser_tilt.cpp
===================================================================
--- pkg/trunk/sandbox/pr2_robot_actions/src/set_laser_tilt.cpp 2009-08-21 15:58:42 UTC (rev 22545)
+++ pkg/trunk/sandbox/pr2_robot_actions/src/set_laser_tilt.cpp 2009-08-21 16:03:38 UTC (rev 22546)
@@ -37,7 +37,7 @@
#include <robot_actions/action.h>
#include <robot_actions/action_runner.h>
#include <pr2_msgs/LaserTrajCmd.h>
-#include <pr2_srvs/SetLaserTrajCmd.h>
+#include <pr2_msgs/SetLaserTrajCmd.h>
#include <pr2_robot_actions/SetLaserTiltState.h>
#include <std_msgs/Empty.h>
#include <robot_actions/NoArgumentsActionState.h>
@@ -57,8 +57,8 @@
//first... set the hokuyo node to the desired frequency for navigation
pr2_robot_actions::setHokuyoMode("tilt_hokuyo_node", "navigate");
- pr2_srvs::SetLaserTrajCmd::Request req_laser;
- pr2_srvs::SetLaserTrajCmd::Response res_laser;
+ pr2_msgs::SetLaserTrajCmd::Request req_laser;
+ pr2_msgs::SetLaserTrajCmd::Response res_laser;
req_laser.command.profile = "linear";
req_laser.command.max_rate = 5;
req_laser.command.max_accel = 5;
Modified: pkg/trunk/stacks/laser_drivers/point_cloud_assembler/manifest.xml
===================================================================
--- pkg/trunk/stacks/laser_drivers/point_cloud_assembler/manifest.xml 2009-08-21 15:58:42 UTC (rev 22545)
+++ pkg/trunk/stacks/laser_drivers/point_cloud_assembler/manifest.xml 2009-08-21 16:03:38 UTC (rev 22546)
@@ -12,7 +12,6 @@
<depend package="laser_scan"/>
<depend package="sensor_msgs"/>
<depend package="tf"/>
- <depend package="pr2_srvs"/>
<depend package="pr2_msgs"/>
# For Testing
<depend package="rostest"/>
Modified: pkg/trunk/stacks/laser_drivers/point_cloud_assembler/src/point_cloud_srv.cpp
===================================================================
--- pkg/trunk/stacks/laser_drivers/point_cloud_assembler/src/point_cloud_srv.cpp 2009-08-21 15:58:42 UTC (rev 22545)
+++ pkg/trunk/stacks/laser_drivers/point_cloud_assembler/src/point_cloud_srv.cpp 2009-08-21 16:03:38 UTC (rev 22546)
@@ -36,7 +36,7 @@
// Services
#include "point_cloud_assembler/BuildCloud.h"
#include "point_cloud_assembler/BuildCloudAngle.h"
-#include "pr2_srvs/SetPeriodicCmd.h"
+#include "pr2_msgs/SetPeriodicCmd.h"
// Messages
#include "sensor_msgs/PointCloud.h"
@@ -87,8 +87,8 @@
point_cloud_assembler::BuildCloudAngle::Response &res)
{
// send command to tilt laser scanner
- pr2_srvs::SetPeriodicCmd::Request scan_req;
- pr2_srvs::SetPeriodicCmd::Response scan_res;
+ pr2_msgs::SetPeriodicCmd::Request scan_req;
+ pr2_msgs::SetPeriodicCmd::Response scan_res;
scan_req.command.amplitude = fabs(req.angle_end - req.angle_begin)/2.0;
scan_req.command.offset = (req.angle_end + req.angle_begin)/2.0;
scan_req.command.period = req.duration*2.0;
Modified: pkg/trunk/stacks/pr2_common/pr2_msgs/CMakeLists.txt
===================================================================
--- pkg/trunk/stacks/pr2_common/pr2_msgs/CMakeLists.txt 2009-08-21 15:58:42 UTC (rev 22545)
+++ pkg/trunk/stacks/pr2_common/pr2_msgs/CMakeLists.txt 2009-08-21 16:03:38 UTC (rev 22546)
@@ -2,5 +2,6 @@
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
rospack(pr2_msgs)
genmsg()
+gensrv()
Modified: pkg/trunk/stacks/pr2_common/pr2_msgs/manifest.xml
===================================================================
--- pkg/trunk/stacks/pr2_common/pr2_msgs/manifest.xml 2009-08-21 15:58:42 UTC (rev 22545)
+++ pkg/trunk/stacks/pr2_common/pr2_msgs/manifest.xml 2009-08-21 16:03:38 UTC (rev 22546)
@@ -17,7 +17,7 @@
<depend package="rosbagmigration"/>
<export>
- <cpp cflags="-I${prefix}/msg/cpp"/>
+ <cpp cflags="-I${prefix}/msg/cpp -I${prefix}/srv/cpp"/>
<rosbagmigration rule_file="migration_rules/pr2_msgs.bmr"/>
</export>
</package>
Property changes on: pkg/trunk/stacks/pr2_common/pr2_msgs/srv
___________________________________________________________________
Added: svn:ignore
+ java
lisp
oct
cpp
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/pr2/pr2_srvs/srv:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
