Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[10497] pkg/trunk
|
From: <sf...@us...> - 2009-02-03 22:11:17
|
Revision: 10497
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=10497&view=rev
Author: sfkwc
Date: 2009-02-03 22:02:50 +0000 (Tue, 03 Feb 2009)
Log Message:
-----------
rostools migrated to roslib. updated load_manifest calls and other uses of rostools
Modified Paths:
--------------
pkg/trunk/calibration/kinematic_calibration/scripts/arm_commander.py
pkg/trunk/calibration/kinematic_calibration/scripts/goto_next.py
pkg/trunk/calibration/kinematic_calibration/scripts/joy_cmd_head.py
pkg/trunk/calibration/kinematic_calibration/scripts/joy_goto_next.py
pkg/trunk/calibration/kinematic_calibration/scripts/unpack.py
pkg/trunk/calibration/laser_camera_calibration/gatherdata.py
pkg/trunk/controllers/pr2_mechanism_controllers/scripts/control_base_position.py
pkg/trunk/controllers/pr2_mechanism_controllers/scripts/control_base_position_ground_truth.py
pkg/trunk/controllers/pr2_mechanism_controllers/scripts/control_laser.py
pkg/trunk/controllers/pr2_mechanism_controllers/scripts/pointhead.py
pkg/trunk/controllers/pr2_mechanism_controllers/scripts/send_periodic_cmd.py
pkg/trunk/controllers/pr2_mechanism_controllers/scripts/send_track_link_cmd.py
pkg/trunk/controllers/robot_mechanism_controllers/scripts/control.py
pkg/trunk/controllers/robot_mechanism_controllers/scripts/effect.py
pkg/trunk/controllers/robot_mechanism_controllers/scripts/lqr.py
pkg/trunk/controllers/robot_mechanism_controllers/scripts/moveto_pose.py
pkg/trunk/controllers/robot_mechanism_controllers/scripts/moveto_trajectory.py
pkg/trunk/controllers/robot_mechanism_controllers/scripts/position.py
pkg/trunk/controllers/robot_mechanism_controllers/src/robot_mechanism_controllers/controller.py
pkg/trunk/controllers/robot_mechanism_controllers/src/robot_mechanism_controllers/controllers.py
pkg/trunk/controllers/robot_mechanism_controllers/src/robot_mechanism_controllers/joint_controllers.py
pkg/trunk/controllers/robot_mechanism_controllers/src/robot_mechanism_controllers/lqr_controller.py
pkg/trunk/demos/2dnav_gazebo/manifest.xml
pkg/trunk/demos/2dnav_pr2/parse_logs.py
pkg/trunk/demos/2dnav_pr2/pose_listen.py
pkg/trunk/demos/2dnav_pr2/spine_levitation.py
pkg/trunk/demos/arm_gazebo/grasp_preprogrammed.py
pkg/trunk/demos/arm_gazebo/setparam.py
pkg/trunk/demos/pr2_gazebo/tuck_arms.py
pkg/trunk/demos/test_2dnav_gazebo/set_goal.py
pkg/trunk/drivers/network/wifi_ddwrt/nodes/ddwrt
pkg/trunk/drivers/robot/pr2/ocean_battery_driver/scripts/monitor
pkg/trunk/drivers/robot/pr2/ocean_battery_driver/scripts/view_batteries
pkg/trunk/drivers/robot/pr2/ocean_battery_driver/src/ocean_battery_driver/ibps_panel.py
pkg/trunk/drivers/robot/pr2/pr2_power_board/scripts/send_command
pkg/trunk/drivers/robot/pr2/pr2_power_board/scripts/view_power
pkg/trunk/drivers/robot/pr2/pr2_power_board/src/pr2_power_board/power_wires.py
pkg/trunk/drivers/robot/pr2/pr2_power_board/src/pr2_power_board/pr2_power_board_panel.py
pkg/trunk/drivers/simulator/gazebo_plugin/doc.dox
pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_time.h
pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_time.cpp
pkg/trunk/drivers/simulator/test_gazebo_plugin/test_pendulum.py
pkg/trunk/drivers/simulator/test_pr2_collision_gazebo/test_slide.py
pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_arm.py
pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_base_odomw_gt.py
pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_base_odomx_gt.py
pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_base_odomxy_gt.py
pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_base_odomxyw_gt.py
pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_base_odomy_gt.py
pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_base_vw_gt.py
pkg/trunk/drivers/simulator/test_pr2_sensors_gazebo/test_camera.py
pkg/trunk/drivers/simulator/test_pr2_sensors_gazebo/test_scan.py
pkg/trunk/hardware_test/life_test/arm_life_test/random_poses.py
pkg/trunk/hardware_test/life_test/arm_life_test/random_positions_fast.py
pkg/trunk/hardware_test/life_test/arm_life_test/random_positions_slow.py
pkg/trunk/hardware_test/life_test/arm_life_test/random_wrenches.py
pkg/trunk/hardware_test/life_test/caster_life_test/periodic_drive.py
pkg/trunk/hardware_test/life_test/elbow_life_test/cycle_elbow.py
pkg/trunk/hardware_test/life_test/gripper_life_test/effort_controller.py
pkg/trunk/hardware_test/life_test/gripper_life_test/random_efforts.py
pkg/trunk/hardware_test/life_test/head_test/impact_test/impact_head_test.py
pkg/trunk/hardware_test/qualification/bin/gui
pkg/trunk/hardware_test/qualification/bin/gui_test
pkg/trunk/hardware_test/qualification/scripts/configure_mcbs.py
pkg/trunk/hardware_test/qualification/scripts/confirm_conf.py
pkg/trunk/hardware_test/qualification/scripts/hysteresis_sinesweep_plot.py
pkg/trunk/hardware_test/qualification/scripts/power_board_disable.py
pkg/trunk/hardware_test/qualification/scripts/power_board_standby.py
pkg/trunk/hardware_test/qualification/scripts/power_cycle_power_board.py
pkg/trunk/hardware_test/qualification/scripts/program_mcb.py
pkg/trunk/hardware_test/qualification/scripts/run_selftest.py
pkg/trunk/hardware_test/qualification/scripts/visual_verifier.py
pkg/trunk/hardware_test/qualification/scripts/wait_for_stationary.py
pkg/trunk/hardware_test/qualification/src/qualification/ui.py
pkg/trunk/hardware_test/qualification/tests/ethernet_test/ethernet_test.py
pkg/trunk/hardware_test/qualification/tests/simple_example/analyzer_node.py
pkg/trunk/hardware_test/qualification/tests/simple_example/test_node.py
pkg/trunk/hardware_test/runtime_monitor/scripts/log_runtime_messages
pkg/trunk/hardware_test/runtime_monitor/scripts/monitor
pkg/trunk/hardware_test/runtime_monitor/scripts/runtime_test
pkg/trunk/hardware_test/runtime_monitor/scripts/test_high_level
pkg/trunk/hardware_test/runtime_monitor/scripts/wxmonitor.py
pkg/trunk/hardware_test/runtime_monitor/src/runtime_monitor/expected.py
pkg/trunk/hardware_test/runtime_monitor/src/runtime_monitor/monitor_panel.py
pkg/trunk/hardware_test/runtime_monitor/src/runtime_monitor/test_test.py
pkg/trunk/hardware_test/runtime_monitor/testmonitor.py
pkg/trunk/hardware_test/thrash_joint/thrash_joint.py
pkg/trunk/highlevel/executive_python/bin/run_milestone_1.py
pkg/trunk/highlevel/executive_python/src/battery_monitor_adapter.py
pkg/trunk/highlevel/executive_python/src/exec_table_object_manip.py
pkg/trunk/highlevel/executive_python/src/executive.py
pkg/trunk/highlevel/executive_python/src/navigation_adapter.py
pkg/trunk/highlevel/executive_python/src/recharge_adapter.py
pkg/trunk/highlevel/executive_trex/executive_trex_pr2/fake_battery_controller.py
pkg/trunk/manip/teleop_joint_effort/teleop_joint_effort.py
pkg/trunk/manip/teleop_joint_effort/teleop_joint_effort_button.py
pkg/trunk/manip/teleop_spacenav/spacenav_teleop.py
pkg/trunk/mechanism/mechanism_bringup/scripts/calibrate.py
pkg/trunk/mechanism/mechanism_control/include/mechanism_control/mechanism_control.h
pkg/trunk/mechanism/mechanism_control/scripts/detect.py
pkg/trunk/mechanism/mechanism_control/scripts/listen.py
pkg/trunk/mechanism/mechanism_control/scripts/mech.py
pkg/trunk/mechanism/mechanism_control/scripts/spawner.py
pkg/trunk/mechanism/mechanism_control/scripts/writer.py
pkg/trunk/mechanism/mechanism_control/src/mechanism_control/mechanism.py
pkg/trunk/mechanism/mechanism_control/test/listenerpublisher_ms.py
pkg/trunk/mechanism/mechanism_control/test/test_ms.py
pkg/trunk/mechanism/mechanism_control/test/test_ms_cpp.py
pkg/trunk/motion_planning/test_collision_space/src/test_cs.cpp
pkg/trunk/nav/trajectory_rollout/scripts/indefinite_nav.py
pkg/trunk/nav/trajectory_rollout/scripts/listen.py
pkg/trunk/prcore/tf/viewFrames.py
pkg/trunk/prcore/xacro/test/test_xacro.py
pkg/trunk/prcore/xacro/xacro.py
pkg/trunk/robot_control_loops/pr2_etherCAT/scripts/reset_motors.py
pkg/trunk/robot_descriptions/pr2/pr2_configurations/head_test_cart/run_head_test.py
pkg/trunk/robot_descriptions/pr2/pr2_configurations/pr2_prototype1/motor_monitor.py
pkg/trunk/simulators/rosstage/rosstage.cc
pkg/trunk/simulators/simulator_integration_tests/world_3d_map_gazebo_tests/testcloud.py
pkg/trunk/util/filter_coefficient_server/scripts/filter_coeff_client.py
pkg/trunk/util/filter_demo/scripts/demo_plot.py
pkg/trunk/util/ntp_monitor/ntp_monitor.py
pkg/trunk/vision/calonder_descriptor/test/directed.py
pkg/trunk/vision/people/src/leg_detector.cpp
pkg/trunk/vision/people/src/stereo_face_feature_tracker.py
pkg/trunk/vision/place_recognition/test/directed.py
pkg/trunk/vision/place_recognition/test/thrash.py
pkg/trunk/vision/star_detector/test/directed.py
pkg/trunk/vision/vision_utils/scripts/bagsort.py
pkg/trunk/vision/vision_utils/src/bag2tiff
pkg/trunk/vision/visual_odometry/nodes/camview_py.py
pkg/trunk/vision/visual_odometry/nodes/corrector.py
pkg/trunk/vision/visual_odometry/nodes/lineperf.py
pkg/trunk/vision/visual_odometry/nodes/vo.py
pkg/trunk/vision/visual_odometry/scripts/confusion.py
pkg/trunk/vision/visual_odometry/scripts/mkgeo.py
pkg/trunk/vision/visual_odometry/scripts/mkmovie.py
pkg/trunk/vision/visual_odometry/scripts/mkplot.py
pkg/trunk/vision/visual_odometry/scripts/mkplot_harris.py
pkg/trunk/vision/visual_odometry/scripts/mkrun.py
pkg/trunk/vision/visual_odometry/scripts/pruner.py
pkg/trunk/vision/visual_odometry/scripts/sos.py
pkg/trunk/vision/visual_odometry/src/marker.py
pkg/trunk/vision/visual_odometry/test/directed.py
pkg/trunk/vision/visual_odometry/test/render.py
pkg/trunk/vision/visual_odometry/test/render2.py
pkg/trunk/vision/visual_odometry/test/render3.py
pkg/trunk/vision/visual_odometry/test/render4.py
pkg/trunk/vision/vslam/scripts/mkplot.py
pkg/trunk/vision/vslam/scripts/mkplot_phsp.py
pkg/trunk/vision/vslam/scripts/plot3d.py
pkg/trunk/vision/vslam/scripts/plot_phsp.py
pkg/trunk/vision/vslam/scripts/prtest.py
pkg/trunk/vision/vslam/scripts/trajectorysynth.py
pkg/trunk/vision/vslam/scripts/transf_fit.py
pkg/trunk/vision/vslam/scripts/wobbler.py
pkg/trunk/vision/vslam/src/skeleton.py
pkg/trunk/vision/vslam/test/calonder.py
pkg/trunk/visualization/multitouch_nav/.build_version
pkg/trunk/visualization/ogre_tools/manifest.xml
pkg/trunk/visualization/ogre_visualizer/scripts/standalone_visualizer.py
pkg/trunk/visualization/ogre_visualizer/src/ogre_visualizer/visualization_manager.h
pkg/trunk/visualization/pr2_dashboard/manifest.xml
pkg/trunk/visualization/pr2_dashboard/scripts/pr2_dashboard
pkg/trunk/visualization/pr2_dashboard/src/pr2_dashboard/hardware_panel.py
pkg/trunk/visualization/pr2_dashboard/src/pr2_dashboard/pr2_frame.py
pkg/trunk/visualization/pr2_dashboard/src/pr2_dashboard/reset.py
pkg/trunk/visualization/pr2_gui/manifest.xml
pkg/trunk/visualization/pr2_gui/scripts/pr2_gui
pkg/trunk/visualization/pr2_gui/src/pr2_gui/hardware_panel.py
pkg/trunk/visualization/pr2_gui/src/pr2_gui/pr2_frame.py
pkg/trunk/visualization/pr2_gui/src/pr2_gui/reset.py
pkg/trunk/visualization/pr2_gui/src/pr2_gui/visualizer_panel.py
pkg/trunk/visualization/wx_camera_panel/scripts/standalone_camera.py
pkg/trunk/visualization/wxpy_ros/demos/ros_panel.py
pkg/trunk/visualization/wxpy_ros/demos/ros_simple.py
pkg/trunk/visualization/wxpy_ros/src/wxpy_ros/roscom.py
pkg/trunk/visualization/wxpy_ros/src/wxpy_ros/wxplot.py
pkg/trunk/visualization/wxpy_ros/src/wxpy_ros/wxros.py
pkg/trunk/visualization/wxpy_ros/tests/my_plot.py
pkg/trunk/visualization/wxpy_ros/tests/ros_panel.py
pkg/trunk/visualization/wxpy_ros/tests/roscom.py
pkg/trunk/visualization/wxpy_ros/tests/test_try.py
pkg/trunk/world_models/static_map_server/nodes/map_server
pkg/trunk/world_models/static_map_server/test/consumer.py
Modified: pkg/trunk/calibration/kinematic_calibration/scripts/arm_commander.py
===================================================================
--- pkg/trunk/calibration/kinematic_calibration/scripts/arm_commander.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/calibration/kinematic_calibration/scripts/arm_commander.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-import rostools
-rostools.load_manifest('kinematic_calibration')
+import roslib
+roslib.load_manifest('kinematic_calibration')
import rospy
import sys
Modified: pkg/trunk/calibration/kinematic_calibration/scripts/goto_next.py
===================================================================
--- pkg/trunk/calibration/kinematic_calibration/scripts/goto_next.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/calibration/kinematic_calibration/scripts/goto_next.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-import rostools; rostools.load_manifest('kinematic_calibration')
+import roslib; roslib.load_manifest('kinematic_calibration')
import sys
import rospy
from roscpp.msg import Empty
Modified: pkg/trunk/calibration/kinematic_calibration/scripts/joy_cmd_head.py
===================================================================
--- pkg/trunk/calibration/kinematic_calibration/scripts/joy_cmd_head.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/calibration/kinematic_calibration/scripts/joy_cmd_head.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-import rostools; rostools.load_manifest('kinematic_calibration')
+import roslib; roslib.load_manifest('kinematic_calibration')
import sys
import rospy
from std_msgs.msg import PointStamped, Point
@@ -10,7 +10,7 @@
def joy_callback(data, pub):
print 'Got joystick Comand'
if data.buttons[7] == 1:
- pub.publish(PointStamped(rostools.msg.Header(None, None, 'r_gripper_palm_link'), Point(0.17, 0, 0)))
+ pub.publish(PointStamped(roslib.msg.Header(None, None, 'r_gripper_palm_link'), Point(0.17, 0, 0)))
print 'Sent head Command'
if __name__ == '__main__':
Modified: pkg/trunk/calibration/kinematic_calibration/scripts/joy_goto_next.py
===================================================================
--- pkg/trunk/calibration/kinematic_calibration/scripts/joy_goto_next.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/calibration/kinematic_calibration/scripts/joy_goto_next.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-import rostools; rostools.load_manifest('kinematic_calibration')
+import roslib; roslib.load_manifest('kinematic_calibration')
import sys
import rospy
from roscpp.msg import Empty
Modified: pkg/trunk/calibration/kinematic_calibration/scripts/unpack.py
===================================================================
--- pkg/trunk/calibration/kinematic_calibration/scripts/unpack.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/calibration/kinematic_calibration/scripts/unpack.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -32,8 +32,8 @@
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-import rostools
-rostools.load_manifest('kinematic_calibration')
+import roslib
+roslib.load_manifest('kinematic_calibration')
import rospy
import sys
import Image as Image
Modified: pkg/trunk/calibration/laser_camera_calibration/gatherdata.py
===================================================================
--- pkg/trunk/calibration/laser_camera_calibration/gatherdata.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/calibration/laser_camera_calibration/gatherdata.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -38,14 +38,14 @@
PKG = 'laser_camera_calibration' # this package name
NAME = 'lasercamera_gatherer'
-import rostools; rostools.load_manifest(PKG)
+import roslib; roslib.load_manifest(PKG)
import sys
import thread
from numpy import *
import rospy
-from rostools import rostime
+from roslib import rostime
from std_msgs.msg import LaserScan
from robot_msgs.msg import MechanismState
from checkerboard_detector.msg import ObjectDetection
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/scripts/control_base_position.py
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/scripts/control_base_position.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/scripts/control_base_position.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -31,7 +31,7 @@
PKG = "pr2_mechanism_controllers"
-import rostools; rostools.load_manifest(PKG)
+import roslib; roslib.load_manifest(PKG)
import sys
import os
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/scripts/control_base_position_ground_truth.py
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/scripts/control_base_position_ground_truth.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/scripts/control_base_position_ground_truth.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -31,7 +31,7 @@
PKG = "pr2_mechanism_controllers"
-import rostools; rostools.load_manifest(PKG)
+import roslib; roslib.load_manifest(PKG)
import sys
import os
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/scripts/control_laser.py
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/scripts/control_laser.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/scripts/control_laser.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -2,7 +2,7 @@
PKG = "pr2_mechanism_controllers"
-import rostools; rostools.load_manifest(PKG)
+import roslib; roslib.load_manifest(PKG)
import sys
import os
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/scripts/pointhead.py
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/scripts/pointhead.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/scripts/pointhead.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -30,7 +30,7 @@
PKG = "pr2_mechanism_controllers"
-import rostools; rostools.load_manifest(PKG)
+import roslib; roslib.load_manifest(PKG)
import sys
import os
@@ -54,7 +54,7 @@
head_angles = rospy.Publisher('head_controller/frame_track_point', PointStamped)
rospy.init_node('head_commander', anonymous=True)
sleep(1)
- head_angles.publish(PointStamped(rostools.msg.Header(None, None, frame), Point(x, y, z)))
+ head_angles.publish(PointStamped(rospy.Header(None, None, frame), Point(x, y, z)))
sleep(1)
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/scripts/send_periodic_cmd.py
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/scripts/send_periodic_cmd.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/scripts/send_periodic_cmd.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -2,7 +2,7 @@
PKG = "pr2_mechanism_controllers"
-import rostools; rostools.load_manifest(PKG)
+import roslib; roslib.load_manifest(PKG)
import sys
import os
@@ -30,7 +30,7 @@
cmd = PeriodicCmd()
controller = sys.argv[1]
- cmd.header = rostools.msg.Header(None, None, None)
+ cmd.header = roslib.msg.Header(None, None, None)
cmd.profile = sys.argv[2]
cmd.period = float (sys.argv[3])
cmd.amplitude = float (sys.argv[4])
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/scripts/send_track_link_cmd.py
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/scripts/send_track_link_cmd.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/scripts/send_track_link_cmd.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -2,7 +2,7 @@
PKG = "pr2_mechanism_controllers"
-import rostools; rostools.load_manifest(PKG)
+import roslib; roslib.load_manifest(PKG)
import sys
import os
Modified: pkg/trunk/controllers/robot_mechanism_controllers/scripts/control.py
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/scripts/control.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/controllers/robot_mechanism_controllers/scripts/control.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -1,7 +1,7 @@
#! /usr/bin/env python
-import rostools
-rostools.load_manifest('robot_mechanism_controllers')
+import roslib
+roslib.load_manifest('robot_mechanism_controllers')
import rospy, sys
from robot_mechanism_controllers.srv import *
Modified: pkg/trunk/controllers/robot_mechanism_controllers/scripts/effect.py
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/scripts/effect.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/controllers/robot_mechanism_controllers/scripts/effect.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -36,9 +36,9 @@
import sys
-import rostools
-rostools.load_manifest('robot_mechanism_controllers')
-rostools.load_manifest('mechanism_control')
+import roslib
+roslib.load_manifest('robot_mechanism_controllers')
+roslib.load_manifest('mechanism_control')
import rospy
from std_msgs.msg import *
from mechanism_control import mechanism
Modified: pkg/trunk/controllers/robot_mechanism_controllers/scripts/lqr.py
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/scripts/lqr.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/controllers/robot_mechanism_controllers/scripts/lqr.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-import rostools
-rostools.load_manifest('robot_mechanism_controllers')
+import roslib
+roslib.load_manifest('robot_mechanism_controllers')
from robot_mechanism_controllers.lqr_controller import *
foo=LQRProxy('right_arm_controller')
Modified: pkg/trunk/controllers/robot_mechanism_controllers/scripts/moveto_pose.py
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/scripts/moveto_pose.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/controllers/robot_mechanism_controllers/scripts/moveto_pose.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -27,8 +27,8 @@
# POSSIBILITY OF SUCH DAMAGE.
-import rostools; rostools.load_manifest('pr2_mechanism_controllers')
-rostools.load_manifest('rospy')
+import roslib; roslib.load_manifest('pr2_mechanism_controllers')
+roslib.load_manifest('rospy')
import random, time
import rospy
Modified: pkg/trunk/controllers/robot_mechanism_controllers/scripts/moveto_trajectory.py
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/scripts/moveto_trajectory.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/controllers/robot_mechanism_controllers/scripts/moveto_trajectory.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -27,8 +27,8 @@
# POSSIBILITY OF SUCH DAMAGE.
-import rostools; rostools.load_manifest('pr2_mechanism_controllers')
-rostools.load_manifest('rospy')
+import roslib; roslib.load_manifest('pr2_mechanism_controllers')
+roslib.load_manifest('rospy')
import random, time
import rospy
Modified: pkg/trunk/controllers/robot_mechanism_controllers/scripts/position.py
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/scripts/position.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/controllers/robot_mechanism_controllers/scripts/position.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -36,9 +36,9 @@
import sys
-import rostools
-rostools.load_manifest('robot_mechanism_controllers')
-rostools.load_manifest('mechanism_control')
+import roslib
+roslib.load_manifest('robot_mechanism_controllers')
+roslib.load_manifest('mechanism_control')
import rospy
from std_msgs.msg import *
from mechanism_control import mechanism
Modified: pkg/trunk/controllers/robot_mechanism_controllers/src/robot_mechanism_controllers/controller.py
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/src/robot_mechanism_controllers/controller.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/controllers/robot_mechanism_controllers/src/robot_mechanism_controllers/controller.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -32,8 +32,8 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-import rostools
-rostools.load_manifest('mechanism_control')
+import roslib
+roslib.load_manifest('mechanism_control')
import rospy, sys
from mechanism_control import mechanism
Modified: pkg/trunk/controllers/robot_mechanism_controllers/src/robot_mechanism_controllers/controllers.py
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/src/robot_mechanism_controllers/controllers.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/controllers/robot_mechanism_controllers/src/robot_mechanism_controllers/controllers.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -1,7 +1,7 @@
#!/usr/bin/env python
-import rostools
-rostools.load_manifest('robot_mechanism_controllers')
+import roslib
+roslib.load_manifest('robot_mechanism_controllers')
import rospy, sys
from robot_mechanism_controllers.srv import *
Modified: pkg/trunk/controllers/robot_mechanism_controllers/src/robot_mechanism_controllers/joint_controllers.py
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/src/robot_mechanism_controllers/joint_controllers.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/controllers/robot_mechanism_controllers/src/robot_mechanism_controllers/joint_controllers.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -1,5 +1,5 @@
from controller import Controller
-import rostools
+import roslib
import rospy
from srv import *
Modified: pkg/trunk/controllers/robot_mechanism_controllers/src/robot_mechanism_controllers/lqr_controller.py
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/src/robot_mechanism_controllers/lqr_controller.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/controllers/robot_mechanism_controllers/src/robot_mechanism_controllers/lqr_controller.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-import rostools; rostools.load_manifest('robot_mechanism_controllers')
+import roslib; roslib.load_manifest('robot_mechanism_controllers')
import rospy, sys
from robot_srvs.srv import *
Modified: pkg/trunk/demos/2dnav_gazebo/manifest.xml
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/manifest.xml 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/demos/2dnav_gazebo/manifest.xml 2009-02-03 22:02:50 UTC (rev 10497)
@@ -4,6 +4,8 @@
<license>BSD</license>
<review status="NA" notes=""/>
<url>http://pr.willowgarage.com/wiki/Simulator</url>
+ <depend package="std_msgs"/>
+ <depend package="robot_msgs"/>
<depend package="nav_view"/>
<depend package="gazebo_plugin"/>
<depend package="map_server"/>
Modified: pkg/trunk/demos/2dnav_pr2/parse_logs.py
===================================================================
--- pkg/trunk/demos/2dnav_pr2/parse_logs.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/demos/2dnav_pr2/parse_logs.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -1,8 +1,8 @@
#! /usr/bin/python
import math
-import rostools
-rostools.load_manifest('2dnav_pr2')
+import roslib
+roslib.load_manifest('2dnav_pr2')
import glob
import sys, traceback, logging, rospy
Modified: pkg/trunk/demos/2dnav_pr2/pose_listen.py
===================================================================
--- pkg/trunk/demos/2dnav_pr2/pose_listen.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/demos/2dnav_pr2/pose_listen.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-import rostools; rostools.load_manifest('2dnav_pr2')
+import roslib; roslib.load_manifest('2dnav_pr2')
import sys, traceback, logging, rospy
from std_msgs.msg import RobotBase2DOdom
Modified: pkg/trunk/demos/2dnav_pr2/spine_levitation.py
===================================================================
--- pkg/trunk/demos/2dnav_pr2/spine_levitation.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/demos/2dnav_pr2/spine_levitation.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -1,6 +1,6 @@
#! /usr/bin/python
-import rostools
-rostools.load_manifest("2dnav_pr2")
+import roslib
+roslib.load_manifest("2dnav_pr2")
import rospy
import time
import math
Modified: pkg/trunk/demos/arm_gazebo/grasp_preprogrammed.py
===================================================================
--- pkg/trunk/demos/arm_gazebo/grasp_preprogrammed.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/demos/arm_gazebo/grasp_preprogrammed.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -38,9 +38,9 @@
NAME = 'grasp_preprogrammed'
import math
-import rostools
-rostools.load_manifest(PKG)
-rostools.load_manifest('rostest')
+import roslib
+roslib.load_manifest(PKG)
+roslib.load_manifest('rostest')
import sys, unittest
Modified: pkg/trunk/demos/arm_gazebo/setparam.py
===================================================================
--- pkg/trunk/demos/arm_gazebo/setparam.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/demos/arm_gazebo/setparam.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -1,3 +1,3 @@
#!/usr/bin/env python
-import rostools.scriptutil as s
+import roslib.scriptutil as s
s.get_param_server().setParam('/', '/robotdesc/pr2', open('pr2_arm.xml').read())
Modified: pkg/trunk/demos/pr2_gazebo/tuck_arms.py
===================================================================
--- pkg/trunk/demos/pr2_gazebo/tuck_arms.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/demos/pr2_gazebo/tuck_arms.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -38,9 +38,9 @@
NAME = 'tuck_arms'
import math
-import rostools
-rostools.load_manifest(PKG)
-rostools.load_manifest('rostest')
+import roslib
+roslib.load_manifest(PKG)
+roslib.load_manifest('rostest')
import sys, unittest
Modified: pkg/trunk/demos/test_2dnav_gazebo/set_goal.py
===================================================================
--- pkg/trunk/demos/test_2dnav_gazebo/set_goal.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/demos/test_2dnav_gazebo/set_goal.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -38,10 +38,10 @@
NAME = 'test_set_goal'
import math
-import rostools
-rostools.load_manifest(PKG)
-rostools.load_manifest('rostest')
-rostools.load_manifest('numpy')
+import roslib
+roslib.load_manifest(PKG)
+roslib.load_manifest('rostest')
+roslib.load_manifest('numpy')
import sys, unittest
Modified: pkg/trunk/drivers/network/wifi_ddwrt/nodes/ddwrt
===================================================================
--- pkg/trunk/drivers/network/wifi_ddwrt/nodes/ddwrt 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/drivers/network/wifi_ddwrt/nodes/ddwrt 2009-02-03 22:02:50 UTC (rev 10497)
@@ -37,7 +37,7 @@
## subscribing to the same topic.
PKG = 'wifi_ddwrt'
-import rostools; rostools.load_manifest(PKG)
+import roslib; roslib.load_manifest(PKG)
import sys, time, StringIO, string
Modified: pkg/trunk/drivers/robot/pr2/ocean_battery_driver/scripts/monitor
===================================================================
--- pkg/trunk/drivers/robot/pr2/ocean_battery_driver/scripts/monitor 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/drivers/robot/pr2/ocean_battery_driver/scripts/monitor 2009-02-03 22:02:50 UTC (rev 10497)
@@ -37,7 +37,7 @@
To run, invoke rosrun ocean_battery_driver monitor
"""
-import rostools; rostools.load_manifest('ocean_battery_driver')
+import roslib; roslib.load_manifest('ocean_battery_driver')
import os
import sys
Modified: pkg/trunk/drivers/robot/pr2/ocean_battery_driver/scripts/view_batteries
===================================================================
--- pkg/trunk/drivers/robot/pr2/ocean_battery_driver/scripts/view_batteries 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/drivers/robot/pr2/ocean_battery_driver/scripts/view_batteries 2009-02-03 22:02:50 UTC (rev 10497)
@@ -34,8 +34,8 @@
## A basic node to listen to and display incoming diagnostic messages using wx
-import rostools
-rostools.load_manifest('ocean_battery_driver')
+import roslib
+roslib.load_manifest('ocean_battery_driver')
import sys
import rospy
Modified: pkg/trunk/drivers/robot/pr2/ocean_battery_driver/src/ocean_battery_driver/ibps_panel.py
===================================================================
--- pkg/trunk/drivers/robot/pr2/ocean_battery_driver/src/ocean_battery_driver/ibps_panel.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/drivers/robot/pr2/ocean_battery_driver/src/ocean_battery_driver/ibps_panel.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -35,8 +35,8 @@
PKG = 'ocean_battery_driver'
-import rostools
-rostools.load_manifest(PKG)
+import roslib
+roslib.load_manifest(PKG)
import sys
import rospy
@@ -54,7 +54,7 @@
self._mutex = threading.Lock()
- xrc_path = rostools.packspec.get_pkg_dir(PKG) + '/ui/battery_status_panel.xrc'
+ xrc_path = roslib.packages.get_pkg_dir(PKG) + '/ui/battery_status_panel.xrc'
self._xrc = xrc.XmlResource(xrc_path)
self._real_panel = self._xrc.LoadPanel(self, 'BatteryStatusPanel')
Modified: pkg/trunk/drivers/robot/pr2/pr2_power_board/scripts/send_command
===================================================================
--- pkg/trunk/drivers/robot/pr2/pr2_power_board/scripts/send_command 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/drivers/robot/pr2/pr2_power_board/scripts/send_command 2009-02-03 22:02:50 UTC (rev 10497)
@@ -37,7 +37,7 @@
PKG = 'pr2_power_board' # this package name
-import rostools; rostools.load_manifest(PKG)
+import roslib; roslib.load_manifest(PKG)
import sys
import os
Modified: pkg/trunk/drivers/robot/pr2/pr2_power_board/scripts/view_power
===================================================================
--- pkg/trunk/drivers/robot/pr2/pr2_power_board/scripts/view_power 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/drivers/robot/pr2/pr2_power_board/scripts/view_power 2009-02-03 22:02:50 UTC (rev 10497)
@@ -34,8 +34,8 @@
## A basic node to listen to and display incoming diagnostic messages using wx
-import rostools
-rostools.load_manifest('pr2_power_board')
+import roslib
+roslib.load_manifest('pr2_power_board')
import sys
import rospy
Modified: pkg/trunk/drivers/robot/pr2/pr2_power_board/src/pr2_power_board/power_wires.py
===================================================================
--- pkg/trunk/drivers/robot/pr2/pr2_power_board/src/pr2_power_board/power_wires.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/drivers/robot/pr2/pr2_power_board/src/pr2_power_board/power_wires.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -32,8 +32,8 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-#import rostools
-#rostools.load_manifest(PKG)
+#import roslib
+#roslib.load_manifest(PKG)
import sys
import rospy
Modified: pkg/trunk/drivers/robot/pr2/pr2_power_board/src/pr2_power_board/pr2_power_board_panel.py
===================================================================
--- pkg/trunk/drivers/robot/pr2/pr2_power_board/src/pr2_power_board/pr2_power_board_panel.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/drivers/robot/pr2/pr2_power_board/src/pr2_power_board/pr2_power_board_panel.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -35,8 +35,8 @@
PKG = 'pr2_power_board'
-import rostools
-rostools.load_manifest(PKG)
+import roslib
+roslib.load_manifest(PKG)
import sys
import rospy
@@ -54,7 +54,7 @@
self._mutex = threading.Lock()
- xrc_path = rostools.packspec.get_pkg_dir(PKG) + '/ui/pr2_power_board_panel.xrc'
+ xrc_path = roslib.packages.get_pkg_dir(PKG) + '/ui/pr2_power_board_panel.xrc'
self._xrc = xrc.XmlResource(xrc_path)
self._real_panel = self._xrc.LoadPanel(self, 'PowerBoardPanel')
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/doc.dox
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/doc.dox 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/doc.dox 2009-02-03 22:02:50 UTC (rev 10497)
@@ -306,7 +306,7 @@
<tr><td> \b finger_tip_R_right_ground_truth </td> <td> std_msgs::PoseWithRatesStamped </td> <td> P3D.hh </td> <td> Ground truth from center of right finger tip on right arm. </td> </tr>
<tr><td> \b axis_right/ptz_state </td> <td> axis_cam::PTZActuatorState </td> <td> Ros_PTZ.hh </td> <td> PTZ cameras actuator positions. </td> </tr>
<tr><td> \b axis_left/ptz_state </td> <td> axis_cam::PTZActuatorState </td> <td> Ros_PTZ.hh </td> <td> PTZ cameras actuator positions. </td> </tr>
- <tr><td> \b time </td> <td> rostools::Time </td> <td> Ros_Time.hh </td> <td> Simulation time. </td> </tr>
+ <tr><td> \b time </td> <td> roslib::Time </td> <td> Ros_Time.hh </td> <td> Simulation time. </td> </tr>
</table><br>
- ROS topics subscribed by the simulator
<table border="1">
@@ -330,7 +330,7 @@
</table><br>
@section templates How To Construct Your Own ROS Gazebo Plugin
-Here is a sample code for making a very simple plugin in Gazebo that publishes \c rostools::Time message over a ROS topic.
+Here is a sample code for making a very simple plugin in Gazebo that publishes \c roslib::Time message over a ROS topic.
\li \b my_plugin.h:
@verbatim
#ifndef MY_PLUGIN_HH
@@ -340,7 +340,7 @@
#include <gazebo/Body.hh>
#include <gazebo/World.hh>
#include <ros/node.h>
-#include <rostools/Time.h>
+#include <roslib/Time.h>
namespace gazebo
{
@@ -370,7 +370,7 @@
private: ros::thread::mutex lock_;
/// \brief pointer to ROS node
ros::node *rosnode_;
- rostools::Time my_message_;
+ roslib::Time my_message_;
/// \brief For loading XML parameters
private: ParamT<std::string> *my_topic_name_p_;
@@ -440,7 +440,7 @@
void MyPlugin::InitChild()
{
// Perform initializations
- rosnode_->advertise<rostools::Time>(this->my_topic_name_,10);
+ rosnode_->advertise<roslib::Time>(this->my_topic_name_,10);
}
////////////////////////////////////////////////////////////////////////////////
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_time.h
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_time.h 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_time.h 2009-02-03 22:02:50 UTC (rev 10497)
@@ -35,7 +35,7 @@
#include "boost/thread/mutex.hpp"
#include <std_msgs/Image.h>
// roscpp - used for broadcasting time over ros
-#include <rostools/Time.h>
+#include <roslib/Time.h>
namespace gazebo
{
@@ -74,7 +74,7 @@
\brief ROS Time Controller
\li Starts a ROS node if none exists
- \li broadcast simulator time over rostools::Time.
+ \li broadcast simulator time over roslib::Time.
\li Example Usage:
\verbatim
<model:physical name="robot_model1">
@@ -123,7 +123,7 @@
private: boost::mutex lock;
/// \brief pointer to ros node
ros::Node *rosnode_;
- rostools::Time timeMsg;
+ roslib::Time timeMsg;
};
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_time.cpp
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_time.cpp 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_time.cpp 2009-02-03 22:02:50 UTC (rev 10497)
@@ -60,7 +60,7 @@
}
// for rostime
- rosnode_->advertise<rostools::Time>("time",10);
+ rosnode_->advertise<roslib::Time>("time",10);
}
Modified: pkg/trunk/drivers/simulator/test_gazebo_plugin/test_pendulum.py
===================================================================
--- pkg/trunk/drivers/simulator/test_gazebo_plugin/test_pendulum.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/drivers/simulator/test_gazebo_plugin/test_pendulum.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -39,9 +39,9 @@
NAME = 'test_pendulum'
import math
-import rostools
-rostools.load_manifest(PKG)
-rostools.load_manifest('rostest')
+import roslib
+roslib.load_manifest(PKG)
+roslib.load_manifest('rostest')
import sys, unittest
import os, os.path, threading, time
Modified: pkg/trunk/drivers/simulator/test_pr2_collision_gazebo/test_slide.py
===================================================================
--- pkg/trunk/drivers/simulator/test_pr2_collision_gazebo/test_slide.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/drivers/simulator/test_pr2_collision_gazebo/test_slide.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -36,9 +36,9 @@
PKG = 'test_pr2_collision_gazebo'
NAME = 'test_slide'
-import rostools
-rostools.load_manifest(PKG)
-rostools.load_manifest('rostest')
+import roslib
+roslib.load_manifest(PKG)
+roslib.load_manifest('rostest')
import unittest, sys, os, math
import time
Modified: pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_arm.py
===================================================================
--- pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_arm.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_arm.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -41,10 +41,10 @@
NAME = 'test_arm'
import math
-import rostools
-rostools.load_manifest(PKG)
-rostools.load_manifest('rostest')
-rostools.load_manifest('numpy')
+import roslib
+roslib.load_manifest(PKG)
+roslib.load_manifest('rostest')
+roslib.load_manifest('numpy')
import sys, unittest
import os, os.path, threading, time
Modified: pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_base_odomw_gt.py
===================================================================
--- pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_base_odomw_gt.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_base_odomw_gt.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -38,9 +38,9 @@
NAME = 'test_base_odomw_gt'
import math
-import rostools
-rostools.load_manifest(PKG)
-rostools.load_manifest('rostest')
+import roslib
+roslib.load_manifest(PKG)
+roslib.load_manifest('rostest')
import sys, unittest
import os, time
Modified: pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_base_odomx_gt.py
===================================================================
--- pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_base_odomx_gt.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_base_odomx_gt.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -38,9 +38,9 @@
NAME = 'test_base_odomx_gt'
import math
-import rostools
-rostools.load_manifest(PKG)
-rostools.load_manifest('rostest')
+import roslib
+roslib.load_manifest(PKG)
+roslib.load_manifest('rostest')
import sys, unittest
import os, time
Modified: pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_base_odomxy_gt.py
===================================================================
--- pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_base_odomxy_gt.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_base_odomxy_gt.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -38,9 +38,9 @@
NAME = 'test_base_odomxy_gt'
import math
-import rostools
-rostools.load_manifest(PKG)
-rostools.load_manifest('rostest')
+import roslib
+roslib.load_manifest(PKG)
+roslib.load_manifest('rostest')
import sys, unittest
import os, os.path, threading, time
Modified: pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_base_odomxyw_gt.py
===================================================================
--- pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_base_odomxyw_gt.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_base_odomxyw_gt.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -38,9 +38,9 @@
NAME = 'test_base_odomw_gt'
import math
-import rostools
-rostools.load_manifest(PKG)
-rostools.load_manifest('rostest')
+import roslib
+roslib.load_manifest(PKG)
+roslib.load_manifest('rostest')
import sys, unittest
import os, time
Modified: pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_base_odomy_gt.py
===================================================================
--- pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_base_odomy_gt.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_base_odomy_gt.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -38,9 +38,9 @@
NAME = 'test_base_odomy_gt'
import math
-import rostools
-rostools.load_manifest(PKG)
-rostools.load_manifest('rostest')
+import roslib
+roslib.load_manifest(PKG)
+roslib.load_manifest('rostest')
import sys, unittest
import os, time
Modified: pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_base_vw_gt.py
===================================================================
--- pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_base_vw_gt.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_base_vw_gt.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -41,9 +41,9 @@
NAME = 'test_base_vw_gt'
import math
-import rostools
-rostools.load_manifest(PKG)
-rostools.load_manifest('rostest')
+import roslib
+roslib.load_manifest(PKG)
+roslib.load_manifest('rostest')
import sys, unittest
import os, time
Modified: pkg/trunk/drivers/simulator/test_pr2_sensors_gazebo/test_camera.py
===================================================================
--- pkg/trunk/drivers/simulator/test_pr2_sensors_gazebo/test_camera.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/drivers/simulator/test_pr2_sensors_gazebo/test_camera.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -38,9 +38,9 @@
NAME = 'test_camera'
import math
-import rostools
-rostools.load_manifest(PKG)
-rostools.load_manifest('rostest')
+import roslib
+roslib.load_manifest(PKG)
+roslib.load_manifest('rostest')
import sys, unittest
import os, os.path, threading, time
Modified: pkg/trunk/drivers/simulator/test_pr2_sensors_gazebo/test_scan.py
===================================================================
--- pkg/trunk/drivers/simulator/test_pr2_sensors_gazebo/test_scan.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/drivers/simulator/test_pr2_sensors_gazebo/test_scan.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -38,9 +38,9 @@
NAME = 'test_scan'
import math
-import rostools
-rostools.load_manifest(PKG)
-rostools.load_manifest('rostest')
+import roslib
+roslib.load_manifest(PKG)
+roslib.load_manifest('rostest')
import sys, unittest
Modified: pkg/trunk/hardware_test/life_test/arm_life_test/random_poses.py
===================================================================
--- pkg/trunk/hardware_test/life_test/arm_life_test/random_poses.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/hardware_test/life_test/arm_life_test/random_poses.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -27,8 +27,8 @@
# POSSIBILITY OF SUCH DAMAGE.
-import rostools; rostools.load_manifest('pr2_mechanism_controllers')
-rostools.load_manifest('rospy')
+import roslib; roslib.load_manifest('pr2_mechanism_controllers')
+roslib.load_manifest('rospy')
import random, time
import rospy
Modified: pkg/trunk/hardware_test/life_test/arm_life_test/random_positions_fast.py
===================================================================
--- pkg/trunk/hardware_test/life_test/arm_life_test/random_positions_fast.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/hardware_test/life_test/arm_life_test/random_positions_fast.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -27,8 +27,8 @@
# POSSIBILITY OF SUCH DAMAGE.
-import rostools; rostools.load_manifest('pr2_mechanism_controllers')
-rostools.load_manifest('rospy')
+import roslib; roslib.load_manifest('pr2_mechanism_controllers')
+roslib.load_manifest('rospy')
import random, time
import rospy
Modified: pkg/trunk/hardware_test/life_test/arm_life_test/random_positions_slow.py
===================================================================
--- pkg/trunk/hardware_test/life_test/arm_life_test/random_positions_slow.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/hardware_test/life_test/arm_life_test/random_positions_slow.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -27,8 +27,8 @@
# POSSIBILITY OF SUCH DAMAGE.
-import rostools; rostools.load_manifest('pr2_mechanism_controllers')
-rostools.load_manifest('rospy')
+import roslib; roslib.load_manifest('pr2_mechanism_controllers')
+roslib.load_manifest('rospy')
import random, time
import rospy
Modified: pkg/trunk/hardware_test/life_test/arm_life_test/random_wrenches.py
===================================================================
--- pkg/trunk/hardware_test/life_test/arm_life_test/random_wrenches.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/hardware_test/life_test/arm_life_test/random_wrenches.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -27,8 +27,8 @@
# POSSIBILITY OF SUCH DAMAGE.
-import rostools; rostools.load_manifest('pr2_mechanism_controllers')
-rostools.load_manifest('rospy')
+import roslib; roslib.load_manifest('pr2_mechanism_controllers')
+roslib.load_manifest('rospy')
import random, time
import rospy
Modified: pkg/trunk/hardware_test/life_test/caster_life_test/periodic_drive.py
===================================================================
--- pkg/trunk/hardware_test/life_test/caster_life_test/periodic_drive.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/hardware_test/life_test/caster_life_test/periodic_drive.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -28,8 +28,8 @@
# Author: Stuart Glaser
-import rostools
-rostools.load_manifest('caster_life_test')
+import roslib
+roslib.load_manifest('caster_life_test')
import rospy
from std_msgs.msg import Float64
from robot_msgs.msg import MechanismState
Modified: pkg/trunk/hardware_test/life_test/elbow_life_test/cycle_elbow.py
===================================================================
--- pkg/trunk/hardware_test/life_test/elbow_life_test/cycle_elbow.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/hardware_test/life_test/elbow_life_test/cycle_elbow.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -36,8 +36,8 @@
import sys
-import rostools
-rostools.load_manifest('elbow_life_test')
+import roslib
+roslib.load_manifest('elbow_life_test')
import rospy
from std_msgs.msg import *
from mechanism_control import mechanism
Modified: pkg/trunk/hardware_test/life_test/gripper_life_test/effort_controller.py
===================================================================
--- pkg/trunk/hardware_test/life_test/gripper_life_test/effort_controller.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/hardware_test/life_test/gripper_life_test/effort_controller.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -36,8 +36,8 @@
import sys
-import rostools
-rostools.load_manifest('gripper_life_test')
+import roslib
+roslib.load_manifest('gripper_life_test')
import rospy
from std_msgs.msg import *
from joy.msg import Joy
Modified: pkg/trunk/hardware_test/life_test/gripper_life_test/random_efforts.py
===================================================================
--- pkg/trunk/hardware_test/life_test/gripper_life_test/random_efforts.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/hardware_test/life_test/gripper_life_test/random_efforts.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -27,8 +27,8 @@
# POSSIBILITY OF SUCH DAMAGE.
-import rostools; rostools.load_manifest('pr2_mechanism_controllers')
-rostools.load_manifest('rospy')
+import roslib; roslib.load_manifest('pr2_mechanism_controllers')
+roslib.load_manifest('rospy')
import random, time
import rospy
Modified: pkg/trunk/hardware_test/life_test/head_test/impact_test/impact_head_test.py
===================================================================
--- pkg/trunk/hardware_test/life_test/head_test/impact_test/impact_head_test.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/hardware_test/life_test/head_test/impact_test/impact_head_test.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -51,8 +51,8 @@
import sys
-import rostools
-rostools.load_manifest('impact_test') # Rename to path head_impact_test
+import roslib
+roslib.load_manifest('impact_test') # Rename to path head_impact_test
import rospy
from std_msgs.msg import *
from mechanism_control import mechanism
Modified: pkg/trunk/hardware_test/qualification/bin/gui
===================================================================
--- pkg/trunk/hardware_test/qualification/bin/gui 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/hardware_test/qualification/bin/gui 2009-02-03 22:02:50 UTC (rev 10497)
@@ -32,8 +32,8 @@
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-import rostools
-rostools.load_manifest('qualification')
+import roslib
+roslib.load_manifest('qualification')
import wx
Modified: pkg/trunk/hardware_test/qualification/bin/gui_test
===================================================================
--- pkg/trunk/hardware_test/qualification/bin/gui_test 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/hardware_test/qualification/bin/gui_test 2009-02-03 22:02:50 UTC (rev 10497)
@@ -32,8 +32,8 @@
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-import rostools
-rostools.load_manifest('qualification')
+import roslib
+roslib.load_manifest('qualification')
import wx
Modified: pkg/trunk/hardware_test/qualification/scripts/configure_mcbs.py
===================================================================
--- pkg/trunk/hardware_test/qualification/scripts/configure_mcbs.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/hardware_test/qualification/scripts/configure_mcbs.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -33,8 +33,8 @@
# POSSIBILITY OF SUCH DAMAGE.
-import rostools
-rostools.load_manifest('qualification')
+import roslib
+roslib.load_manifest('qualification')
import rospy, sys, time
import subprocess
from optparse import OptionParser
@@ -57,7 +57,7 @@
mcbs.append(args.split(","))
-path = rostools.packspec.get_pkg_dir("ethercat_hardware", True)
+path = roslib.packages.get_pkg_dir("ethercat_hardware", True)
actuator_path = path + "/actuators.conf"
success = True
Modified: pkg/trunk/hardware_test/qualification/scripts/confirm_conf.py
===================================================================
--- pkg/trunk/hardware_test/qualification/scripts/confirm_conf.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/hardware_test/qualification/scripts/confirm_conf.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -38,8 +38,8 @@
PKG = 'qualification' # this package name
NAME = 'mcb_conf_verification'
-import rostools
-rostools.load_manifest(PKG)
+import roslib
+roslib.load_manifest(PKG)
import wx
from std_srvs.srv import *
import rospy
Modified: pkg/trunk/hardware_test/qualification/scripts/hysteresis_sinesweep_plot.py
===================================================================
--- pkg/trunk/hardware_test/qualification/scripts/hysteresis_sinesweep_plot.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/hardware_test/qualification/scripts/hysteresis_sinesweep_plot.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -30,7 +30,7 @@
PKG = "qualification"
-import rostools; rostools.load_manifest(PKG)
+import roslib; roslib.load_manifest(PKG)
import numpy
import math
Modified: pkg/trunk/hardware_test/qualification/scripts/power_board_disable.py
===================================================================
--- pkg/trunk/hardware_test/qualification/scripts/power_board_disable.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/hardware_test/qualification/scripts/power_board_disable.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -33,8 +33,8 @@
# POSSIBILITY OF SUCH DAMAGE.
-import rostools
-rostools.load_manifest('qualification')
+import roslib
+roslib.load_manifest('qualification')
import rospy, sys,time
import subprocess
from optparse import OptionParser
@@ -51,7 +51,7 @@
options, args = parser.parse_args()
print "Shutting down Power Board"
-path = rostools.packspec.get_pkg_dir("pr2_power_board", True)
+path = roslib.packages.get_pkg_dir("pr2_power_board", True)
try:
retcode = subprocess.call(path + "/scripts/send_command 0 disable", shell=True)
if retcode != 0:
Modified: pkg/trunk/hardware_test/qualification/scripts/power_board_standby.py
===================================================================
--- pkg/trunk/hardware_test/qualification/scripts/power_board_standby.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/hardware_test/qualification/scripts/power_board_standby.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -33,8 +33,8 @@
# POSSIBILITY OF SUCH DAMAGE.
-import rostools
-rostools.load_manifest('qualification')
+import roslib
+roslib.load_manifest('qualification')
import rospy, sys,time
import subprocess
from optparse import OptionParser
@@ -51,7 +51,7 @@
options, args = parser.parse_args()
-path = rostools.packspec.get_pkg_dir("pr2_power_board", True)
+path = roslib.packages.get_pkg_dir("pr2_power_board", True)
try:
retcode = subprocess.call(path + "/scripts/send_command 0 reset", shell=True)
if retcode != 0:
Modified: pkg/trunk/hardware_test/qualification/scripts/power_cycle_power_board.py
===================================================================
--- pkg/trunk/hardware_test/qualification/scripts/power_cycle_power_board.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/hardware_test/qualification/scripts/power_cycle_power_board.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -33,8 +33,8 @@
# POSSIBILITY OF SUCH DAMAGE.
-import rostools
-rostools.load_manifest('qualification')
+import roslib
+roslib.load_manifest('qualification')
import rospy, sys,time
import subprocess
from optparse import OptionParser
@@ -51,7 +51,7 @@
options, args = parser.parse_args()
-path = rostools.packspec.get_pkg_dir("pr2_power_board", True)
+path = roslib.packages.get_pkg_dir("pr2_power_board", True)
try:
print path
retcode = subprocess.call(path + "/scripts/send_command 0 disable", shell=True)
Modified: pkg/trunk/hardware_test/qualification/scripts/program_mcb.py
===================================================================
--- pkg/trunk/hardware_test/qualification/scripts/program_mcb.py 2009-02-03 22:01:10 UTC (rev 10496)
+++ pkg/trunk/hardware_test/qualification/scripts/program_mcb.py 2009-02-03 22:02:50 UTC (rev 10497)
@@ -33,8 +33,8 @@
# POSSIBILITY OF SUCH DAMAGE.
-import rostools
-rostools.load_manifest('qualification')
+import roslib
+roslib.load_manifest('qualification')
import rospy, sys
import subprocess
from optparse import OptionParser
...
[truncated message content] |
