|
From: <rob...@us...> - 2008-10-14 01:08:39
|
Revision: 5315
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=5315&view=rev
Author: rob_wheeler
Date: 2008-10-14 01:08:32 +0000 (Tue, 14 Oct 2008)
Log Message:
-----------
Move mechanism_control msgs and srvs to robot_msgs and robot_srvs.
- manifest files and scripts missed in previous checkin
Modified Paths:
--------------
pkg/trunk/hardware_test/qualification/manifest.xml
pkg/trunk/hardware_test/qualification/src/qualification/tests/motor_test/motor_test.py
pkg/trunk/manip/teleop_robot/manifest.xml
pkg/trunk/manip/teleop_robot/scripts/calibrate.py
pkg/trunk/manip/teleop_robot/scripts/calibrate_tilt_laser.py
pkg/trunk/manip/teleop_robot/src/teleop_robot/robot_interface.py
pkg/trunk/mechanism/mechanism_bringup/manifest.xml
pkg/trunk/mechanism/mechanism_bringup/scripts/calibrate_base.py
pkg/trunk/mechanism/mechanism_bringup/scripts/calibrate_head.py
pkg/trunk/mechanism/mechanism_bringup/scripts/calibrate_tilt_laser.py
pkg/trunk/motion_planning/planning_node_util/manifest.xml
Modified: pkg/trunk/hardware_test/qualification/manifest.xml
===================================================================
--- pkg/trunk/hardware_test/qualification/manifest.xml 2008-10-14 00:48:39 UTC (rev 5314)
+++ pkg/trunk/hardware_test/qualification/manifest.xml 2008-10-14 01:08:32 UTC (rev 5315)
@@ -10,7 +10,6 @@
<depend package="hokuyo_node" />
<depend package="imu_node" />
<depend package="wxmpl" />
- <depend package="mechanism_control" />
<depend package="robot_mechanism_controllers" />
<url></url>
<sysdepend os="ubuntu" version="7.04-feisty" package="python-wxgtk2.8"/>
Modified: pkg/trunk/hardware_test/qualification/src/qualification/tests/motor_test/motor_test.py
===================================================================
--- pkg/trunk/hardware_test/qualification/src/qualification/tests/motor_test/motor_test.py 2008-10-14 00:48:39 UTC (rev 5314)
+++ pkg/trunk/hardware_test/qualification/src/qualification/tests/motor_test/motor_test.py 2008-10-14 01:08:32 UTC (rev 5315)
@@ -45,7 +45,6 @@
from robot_msgs.msg import *
from robot_srvs.srv import *
-from mechanism_control.msg import *
from mechanism_control import mechanism
Modified: pkg/trunk/manip/teleop_robot/manifest.xml
===================================================================
--- pkg/trunk/manip/teleop_robot/manifest.xml 2008-10-14 00:48:39 UTC (rev 5314)
+++ pkg/trunk/manip/teleop_robot/manifest.xml 2008-10-14 01:08:32 UTC (rev 5315)
@@ -4,5 +4,5 @@
<license>BSD</license>
<depend package="robot_mechanism_controllers"/>
<depend package="pr2_mechanism_controllers"/>
- <depend package="mechanism_control"/>
+ <depend package="robot_srvs"/>
</package>
Modified: pkg/trunk/manip/teleop_robot/scripts/calibrate.py
===================================================================
--- pkg/trunk/manip/teleop_robot/scripts/calibrate.py 2008-10-14 00:48:39 UTC (rev 5314)
+++ pkg/trunk/manip/teleop_robot/scripts/calibrate.py 2008-10-14 01:08:32 UTC (rev 5315)
@@ -41,7 +41,7 @@
# Loads interface with the robot.
rostools.update_path('teleop_robot')
import rospy
-from mechanism_control.srv import *
+from robot_srvs.srv import *
from robot_mechanism_controllers.srv import *
def slurp(filename):
Modified: pkg/trunk/manip/teleop_robot/scripts/calibrate_tilt_laser.py
===================================================================
--- pkg/trunk/manip/teleop_robot/scripts/calibrate_tilt_laser.py 2008-10-14 00:48:39 UTC (rev 5314)
+++ pkg/trunk/manip/teleop_robot/scripts/calibrate_tilt_laser.py 2008-10-14 01:08:32 UTC (rev 5315)
@@ -40,7 +40,7 @@
# Loads interface with the robot.
rostools.update_path('teleop_robot')
import rospy
-from mechanism_control.srv import *
+from robot_srvs.srv import *
from robot_mechanism_controllers.srv import *
def slurp(filename):
Modified: pkg/trunk/manip/teleop_robot/src/teleop_robot/robot_interface.py
===================================================================
--- pkg/trunk/manip/teleop_robot/src/teleop_robot/robot_interface.py 2008-10-14 00:48:39 UTC (rev 5314)
+++ pkg/trunk/manip/teleop_robot/src/teleop_robot/robot_interface.py 2008-10-14 01:08:32 UTC (rev 5315)
@@ -39,8 +39,8 @@
import rostools
import sys
import rospy
-rostools.update_path('mechanism_control')
-from mechanism_control.srv import *
+rostools.update_path('robot_srvs')
+from robot_srvs.srv import *
#TODO: add a controller factory mechanism
@@ -126,4 +126,4 @@
self._channel._previous_time = None
def calibrateArm(self):
- pass
\ No newline at end of file
+ pass
Modified: pkg/trunk/mechanism/mechanism_bringup/manifest.xml
===================================================================
--- pkg/trunk/mechanism/mechanism_bringup/manifest.xml 2008-10-14 00:48:39 UTC (rev 5314)
+++ pkg/trunk/mechanism/mechanism_bringup/manifest.xml 2008-10-14 01:08:32 UTC (rev 5315)
@@ -4,5 +4,5 @@
<license>BSD</license>
<depend package="robot_mechanism_controllers"/>
<depend package="pr2_mechanism_controllers"/>
- <depend package="mechanism_control"/>
+ <depend package="robot_srvs"/>
</package>
Modified: pkg/trunk/mechanism/mechanism_bringup/scripts/calibrate_base.py
===================================================================
--- pkg/trunk/mechanism/mechanism_bringup/scripts/calibrate_base.py 2008-10-14 00:48:39 UTC (rev 5314)
+++ pkg/trunk/mechanism/mechanism_bringup/scripts/calibrate_base.py 2008-10-14 01:08:32 UTC (rev 5315)
@@ -41,7 +41,7 @@
# Loads interface with the robot.
rostools.update_path('teleop_robot')
import rospy
-from mechanism_control.srv import *
+from robot_srvs.srv import *
from robot_mechanism_controllers.srv import *
def slurp(filename):
Modified: pkg/trunk/mechanism/mechanism_bringup/scripts/calibrate_head.py
===================================================================
--- pkg/trunk/mechanism/mechanism_bringup/scripts/calibrate_head.py 2008-10-14 00:48:39 UTC (rev 5314)
+++ pkg/trunk/mechanism/mechanism_bringup/scripts/calibrate_head.py 2008-10-14 01:08:32 UTC (rev 5315)
@@ -41,7 +41,7 @@
# Loads interface with the robot.
rostools.update_path('teleop_robot')
import rospy
-from mechanism_control.srv import *
+from robot_srvs.srv import *
from robot_mechanism_controllers.srv import *
def slurp(filename):
Modified: pkg/trunk/mechanism/mechanism_bringup/scripts/calibrate_tilt_laser.py
===================================================================
--- pkg/trunk/mechanism/mechanism_bringup/scripts/calibrate_tilt_laser.py 2008-10-14 00:48:39 UTC (rev 5314)
+++ pkg/trunk/mechanism/mechanism_bringup/scripts/calibrate_tilt_laser.py 2008-10-14 01:08:32 UTC (rev 5315)
@@ -41,7 +41,7 @@
# Loads interface with the robot.
rostools.update_path('teleop_robot')
import rospy
-from mechanism_control.srv import *
+from robot_srvs.srv import *
from robot_mechanism_controllers.srv import *
def slurp(filename):
Modified: pkg/trunk/motion_planning/planning_node_util/manifest.xml
===================================================================
--- pkg/trunk/motion_planning/planning_node_util/manifest.xml 2008-10-14 00:48:39 UTC (rev 5314)
+++ pkg/trunk/motion_planning/planning_node_util/manifest.xml 2008-10-14 01:08:32 UTC (rev 5315)
@@ -14,7 +14,6 @@
<depend package="planning_models"/>
<depend package="collision_space"/>
- <depend package="mechanism_control"/>
<export>
<cpp cflags="-I${prefix}/include" lflags=""/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|