Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[23293] pkg/trunk
|
From: <mee...@us...> - 2009-08-28 22:11:04
|
Revision: 23293
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=23293&view=rev
Author: meeussen
Date: 2009-08-28 22:09:09 +0000 (Fri, 28 Aug 2009)
Log Message:
-----------
rename packages in mechanism stack to be pr2 specific. door opening test passes
Modified Paths:
--------------
pkg/trunk/applications/2dnav_pr2_app/2dnav_pr2/config/base_odom_teleop.xml
pkg/trunk/applications/2dnav_pr2_app/2dnav_pr2/config/lasers_and_filters.xml
pkg/trunk/applications/2dnav_pr2_app/2dnav_pr2/manifest.xml
pkg/trunk/calibration_experimental/joint_calibration_monitor/manifest.xml
pkg/trunk/calibration_experimental/kinematic_calibration/demo/controllers.launch
pkg/trunk/calibration_experimental/kinematic_calibration/demo/grab_cb_stereo_laser_robot.launch
pkg/trunk/calibration_experimental/kinematic_calibration/manifest.xml
pkg/trunk/calibration_experimental/kinematic_calibration/src/arm_phasespace_grabber.cpp
pkg/trunk/calibration_experimental/kinematic_calibration/src/laser_head_grabber.cpp
pkg/trunk/calibration_experimental/kinematic_calibration/src/sensor_kinematics_grabber.cpp
pkg/trunk/calibration_experimental/laser_camera_calibration/gatherdata.ros.xml
pkg/trunk/calibration_experimental/laser_cb_processing/manifest.xml
pkg/trunk/calibration_experimental/optical_flag_calibration/controllers.launch
pkg/trunk/calibration_experimental/sandbox/calibration_message_filters/include/calibration_message_filters/stationary_elem.h
pkg/trunk/calibration_experimental/sandbox/calibration_message_filters/include/calibration_message_filters/stationary_filter.h
pkg/trunk/calibration_experimental/sandbox/calibration_message_filters/manifest.xml
pkg/trunk/calibration_experimental/sandbox/laser_head_updater/manifest.xml
pkg/trunk/calibration_experimental/sandbox/laser_head_updater/src/publish_laser_head_tf.cpp
pkg/trunk/calibration_experimental/sandbox/laser_head_updater/src/publish_laser_head_tf_pre.cpp
pkg/trunk/calibration_experimental/sandbox/laser_head_updater/src/publish_laser_head_tf_prg.cpp
pkg/trunk/calibration_experimental/sandbox/pr2_calibration_actions/include/pr2_calibration_actions/capture_hand_led.h
pkg/trunk/calibration_experimental/sandbox/pr2_calibration_actions/include/pr2_calibration_actions/joint_states_channel.h
pkg/trunk/calibration_experimental/sandbox/pr2_calibration_actions/include/pr2_calibration_actions/robot_pixels_capture.h
pkg/trunk/calibration_experimental/sandbox/pr2_calibration_actions/manifest.xml
pkg/trunk/calibration_experimental/sandbox/pr2_calibration_actions/src/capture_hand_led.cpp
pkg/trunk/calibration_experimental/sandbox/pr2_calibration_actions/src/joint_states_channel.cpp
pkg/trunk/controllers/mechanism_controller_test/manifest.xml
pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/head_position_controller.h
pkg/trunk/controllers/pr2_mechanism_controllers/manifest.xml
pkg/trunk/controllers/pr2_mechanism_controllers/src/head_position_controller.cpp
pkg/trunk/controllers/robot_mechanism_controllers/manifest.xml
pkg/trunk/demos/2dnav_gazebo/config/lasers_and_filters.launch
pkg/trunk/demos/2dnav_gazebo/config/tuck_arms.launch
pkg/trunk/demos/arm_gazebo/controllers/l_arm_position_controller.launch
pkg/trunk/demos/arm_gazebo/controllers/r_arm_position_controller.launch
pkg/trunk/demos/arm_gazebo/tests/r_arm_constraint.launch
pkg/trunk/demos/door_demos/launch/2dnav_pr2_door.launch
pkg/trunk/demos/door_demos/launch/base_trajectory_controller.launch
pkg/trunk/demos/door_demos/launch/joint_trajectory_controller.launch
pkg/trunk/demos/door_demos_gazebo/launch/door_only_test.launch
pkg/trunk/demos/door_demos_gazebo/launch/pr2_and_door.launch
pkg/trunk/demos/examples_gazebo/dual_link.launch
pkg/trunk/demos/examples_gazebo/multi_link.launch
pkg/trunk/demos/examples_gazebo/single_link.launch
pkg/trunk/demos/handhold/run.launch
pkg/trunk/demos/milestone2/milestone2_actions/config/controllers.xml
pkg/trunk/demos/plug_in/detect_plugstow.launch
pkg/trunk/demos/plug_in/integration/actions.launch
pkg/trunk/demos/plug_in/integration/controllers.launch
pkg/trunk/demos/plug_in/manifest.xml
pkg/trunk/demos/pr2_gazebo/controllers/pr2_position_controllers.launch
pkg/trunk/demos/pr2_gazebo/controllers/pr2_torso_controller.launch
pkg/trunk/demos/pr2_gazebo/controllers/pr2_trajectory_controllers.launch
pkg/trunk/drivers/cam/camera_trigger_test/four_cams.launch
pkg/trunk/drivers/cam/camera_trigger_test/testmode0.launch
pkg/trunk/drivers/cam/camera_trigger_test/testmode1.launch
pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/test_arm.launch
pkg/trunk/highlevel/move_arm/launch/gripper_larm.launch
pkg/trunk/highlevel/move_arm/launch/gripper_rarm.launch
pkg/trunk/highlevel/plugs/plugs_core/include/plugs_core/action_unplug.h
pkg/trunk/highlevel/plugs/plugs_core/manifest.xml
pkg/trunk/highlevel/plugs/plugs_core/src/action_unplug.cpp
pkg/trunk/motion_planning/planning_environment/include/planning_environment/monitors/kinematic_model_state_monitor.h
pkg/trunk/motion_planning/planning_environment/manifest.xml
pkg/trunk/motion_planning/planning_environment/src/monitors/kinematic_model_state_monitor.cpp
pkg/trunk/motion_planning/planning_research/sbpl_arm_planner_node/include/sbpl_arm_planner_node/sbpl_arm_planner_node.h
pkg/trunk/motion_planning/planning_research/sbpl_arm_planner_node/manifest.xml
pkg/trunk/motion_planning/planning_research/sbpl_arm_planner_node/src/sbpl_arm_planner_node.cpp
pkg/trunk/motion_planning/planning_research/sbpl_door_planner_action/include/sbpl_door_planner_action/sbpl_door_planner_action.h
pkg/trunk/motion_planning/planning_research/sbpl_door_planner_action/manifest.xml
pkg/trunk/motion_planning/planning_research/sbpl_door_planner_action/src/sbpl_door_planner_action.cpp
pkg/trunk/nav/people_aware_nav/launch/hallway.xml
pkg/trunk/nav/people_aware_nav/launch/nav_robot.xml
pkg/trunk/nav/visual_nav/launch/head_controller.xml
pkg/trunk/nav/visual_nav/launch/robot.launch
pkg/trunk/openrave_planning/ormanipulation/startlasermap.ros.xml
pkg/trunk/openrave_planning/orrosplanning/manifest.xml
pkg/trunk/openrave_planning/orrosplanning/src/rosrobotcontroller.h
pkg/trunk/pr2/cb_characterization/collect_cb_data.launch
pkg/trunk/pr2/hot_box_test/manifest.xml
pkg/trunk/pr2/life_test/arm_life_test/controller_cartesian_tff_left.launch
pkg/trunk/pr2/life_test/arm_life_test/controller_cartesian_tff_right.launch
pkg/trunk/pr2/life_test/arm_life_test/controller_cartesian_trajectory_left.launch
pkg/trunk/pr2/life_test/arm_life_test/controller_cartesian_trajectory_right.launch
pkg/trunk/pr2/life_test/arm_life_test/controller_cartesian_twist_ik_right.launch
pkg/trunk/pr2/life_test/arm_life_test/run_random_wrenches.launch
pkg/trunk/pr2/life_test/caster_life_test/life_test.launch
pkg/trunk/pr2/life_test/laser_tilt_test/life_test/life_test.launch
pkg/trunk/pr2/life_test/manifest.xml
pkg/trunk/pr2/qualification/onboard/checkout/robot_checkout.launch
pkg/trunk/pr2/qualification/onboard/full_arm_test/hold_arms.launch
pkg/trunk/pr2/qualification/tests/caster_test/caster_checkout.launch
pkg/trunk/pr2/qualification/tests/forearm_cam_test/ethercat.launch
pkg/trunk/pr2/qualification/tests/full_arm_test/full_arm_checkout.launch
pkg/trunk/pr2/qualification/tests/gripper_test/fingertip_qualification.launch
pkg/trunk/pr2/qualification/tests/gripper_test/gripper_checkout.launch
pkg/trunk/pr2/qualification/tests/gripper_test/hysteresis_gripper.launch
pkg/trunk/pr2/qualification/tests/head_test/head_checkout.launch
pkg/trunk/pr2/qualification/tests/head_test/hysteresis_head_pan.launch
pkg/trunk/pr2/qualification/tests/head_test/hysteresis_head_tilt.launch
pkg/trunk/pr2/qualification/tests/head_test/sinesweep_head_pan.launch
pkg/trunk/pr2/qualification/tests/head_test/sinesweep_head_tilt.launch
pkg/trunk/pr2/qualification/tests/laser_tilt_test/hysteresis_laser_tilt.launch
pkg/trunk/pr2/qualification/tests/laser_tilt_test/sinesweep_laser_tilt.launch
pkg/trunk/pr2/qualification/tests/shoulder_test/hysteresis_shoulder_lift.launch
pkg/trunk/pr2/qualification/tests/shoulder_test/hysteresis_shoulder_pan.launch
pkg/trunk/pr2/qualification/tests/shoulder_test/hysteresis_upper_arm_roll.launch
pkg/trunk/pr2/qualification/tests/shoulder_test/shoulder_checkout.launch
pkg/trunk/pr2/qualification/tests/shoulder_test/sinesweep_shoulder_lift.launch
pkg/trunk/pr2/qualification/tests/shoulder_test/sinesweep_shoulder_pan.launch
pkg/trunk/pr2/qualification/tests/shoulder_test/sinesweep_upper_arm_roll.launch
pkg/trunk/pr2/qualification/tests/torso_lift_test/hysteresis_torso_lift.launch
pkg/trunk/pr2/qualification/tests/torso_lift_test/torso_checkout.launch
pkg/trunk/pr2/qualification/tests/upperarm_test/hysteresis_elbow_flex.launch
pkg/trunk/pr2/qualification/tests/upperarm_test/hysteresis_forearm_roll.launch
pkg/trunk/pr2/qualification/tests/upperarm_test/sinesweep_elbow_flex.launch
pkg/trunk/pr2/qualification/tests/upperarm_test/sinesweep_forearm_roll.launch
pkg/trunk/pr2/qualification/tests/upperarm_test/upperarm_checkout.launch
pkg/trunk/pr2/qualification/tests/wrist_test/hysteresis_wrist_flex.launch
pkg/trunk/pr2/qualification/tests/wrist_test/hysteresis_wrist_roll.launch
pkg/trunk/pr2/qualification/tests/wrist_test/sinesweep_wrist_flex.launch
pkg/trunk/pr2/qualification/tests/wrist_test/sinesweep_wrist_roll.launch
pkg/trunk/pr2/qualification/tests/wrist_test/wrist_checkout.launch
pkg/trunk/pr2/teleop/teleop_head/manifest.xml
pkg/trunk/pr2/teleop/teleop_head/teleop_head.cpp
pkg/trunk/pr2/teleop/teleop_head/teleop_head_keyboard.cpp
pkg/trunk/pr2/teleop/teleop_joint_effort/manifest.xml
pkg/trunk/pr2/teleop/teleop_pr2/manifest.xml
pkg/trunk/pr2/teleop/teleop_pr2/teleop_pr2.cpp
pkg/trunk/pr2/teleop/teleop_spacenav/manifest.xml
pkg/trunk/pr2/teleop/teleop_spacenav/teleop_spacenav.launch
pkg/trunk/pr2/tune_joints/launch_controllers.launch
pkg/trunk/robot_descriptions/pr2/pr2_configurations/arm_cart/run_arm_gravity_compensate.launch
pkg/trunk/robot_descriptions/pr2/pr2_configurations/arm_cart/run_base_trajectory_controller.launch
pkg/trunk/robot_descriptions/pr2/pr2_configurations/arm_cart/run_manipulation.launch
pkg/trunk/robot_descriptions/pr2/pr2_configurations/arm_cart/run_random_positions.launch
pkg/trunk/robot_descriptions/pr2/pr2_configurations/arm_cart/run_random_wrenches.launch
pkg/trunk/robot_descriptions/pr2/pr2_configurations/arm_cart/run_spine_trajectory_controller.launch
pkg/trunk/robot_descriptions/pr2/pr2_configurations/arm_cart/run_trajectory_controller.launch
pkg/trunk/robot_descriptions/pr2/pr2_configurations/arm_cart/run_wrist_gravity_compensate.launch
pkg/trunk/robot_descriptions/pr2/pr2_configurations/pr2_head_cart/hca.launch
pkg/trunk/robot_descriptions/pr2/pr2_configurations/pr2_head_cart/hcb.launch
pkg/trunk/robot_descriptions/pr2/pr2_configurations/pr2_head_cart/hcc.launch
pkg/trunk/robot_descriptions/pr2/pr2_configurations/pr2_head_cart/tilt_laser_scan.launch
pkg/trunk/robot_descriptions/pr2/pr2_configurations/pr2_laser_tilt/laser_tilt_controller.launch
pkg/trunk/robot_descriptions/pr2/pr2_configurations/pr2_laser_tilt/slow.launch
pkg/trunk/robot_descriptions/pr2/pr2_configurations/pr2_teleop/controller_cartesian_pose.launch
pkg/trunk/robot_descriptions/pr2/pr2_experimental_controllers/constraint_controllers/constraint.launch
pkg/trunk/robot_descriptions/pr2/pr2_experimental_controllers/constraint_controllers/demo_constraint.launch
pkg/trunk/robot_descriptions/pr2/pr2_experimental_controllers/manifest.xml
pkg/trunk/sandbox/3dnav_pr2/launch/actions/left_arm.launch
pkg/trunk/sandbox/3dnav_pr2/launch/actions/right_arm.launch
pkg/trunk/sandbox/3dnav_pr2/launch/perception/laser+stereo-perception.launch
pkg/trunk/sandbox/3dnav_pr2/launch/perception/laser-perception.launch
pkg/trunk/sandbox/annotated_map_builder/config/controllers.xml
pkg/trunk/sandbox/chomp_motion_planner/include/chomp_motion_planner/chomp_cost_server.h
pkg/trunk/sandbox/chomp_motion_planner/manifest.xml
pkg/trunk/sandbox/chomp_motion_planner/src/chomp_cost_server.cpp
pkg/trunk/sandbox/dallas_controller/manifest.xml
pkg/trunk/sandbox/dynamics_estimation/include/dynamics_estimation/dynamics_estimation_node.h
pkg/trunk/sandbox/dynamics_estimation/manifest.xml
pkg/trunk/sandbox/dynamics_estimation/r_arm.launch
pkg/trunk/sandbox/dynamics_estimation/src/dynamics_estimation_node.cpp
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/head_servoing_controller.h
pkg/trunk/sandbox/experimental_controllers/manifest.xml
pkg/trunk/sandbox/experimental_controllers/src/head_servoing_controller.cpp
pkg/trunk/sandbox/hanoi/manifest.xml
pkg/trunk/sandbox/hanoi/src/Hanoi.cpp
pkg/trunk/sandbox/move_arm_tools/manifest.xml
pkg/trunk/sandbox/person_data/config/controllers.xml
pkg/trunk/sandbox/person_data/data_collector_components/base_odom.xml
pkg/trunk/sandbox/person_data/data_collector_components/teleop_joystick.launch
pkg/trunk/sandbox/person_follower/config/controllers.xml
pkg/trunk/sandbox/pr2_gripper_controller/launch/gripper_cal.launch
pkg/trunk/sandbox/pr2_gripper_controller/launch/gripper_controller.launch
pkg/trunk/sandbox/pr2_gripper_controller/manifest.xml
pkg/trunk/sandbox/pr2_ik_with_collision/manifest.xml
pkg/trunk/sandbox/qualification_controllers/joint_qualification_controllers/manifest.xml
pkg/trunk/sandbox/robot_voxelizer/include/robot_voxelizer/robot_voxelizer.h
pkg/trunk/sandbox/robot_voxelizer/manifest.xml
pkg/trunk/sandbox/robot_voxelizer/src/robot_voxelizer.cpp
pkg/trunk/sandbox/switch_controller_translator/manifest.xml
pkg/trunk/sandbox/switch_controller_translator/src/switch_controller_translator.cpp
pkg/trunk/sandbox/teleop_anti_collision/launch/anti_collision_position/base_odom_teleop.xml
pkg/trunk/sandbox/teleop_anti_collision/launch/anti_collision_velocity/anti_collision_velocity_base_odom_teleop.xml
pkg/trunk/sandbox/teleop_anti_collision/launch/base_odom_teleop.xml
pkg/trunk/sandbox/teleop_anti_collision/manifest.xml
pkg/trunk/sandbox/teleop_anti_collision/src/teleop_goal_projection.cpp
pkg/trunk/sandbox/texas/drive.launch
pkg/trunk/sandbox/texas/drive_base.launch
pkg/trunk/sandbox/texas/drive_base_joy.launch
pkg/trunk/sandbox/texas/manifest.xml
pkg/trunk/sandbox/texas/texas.launch
pkg/trunk/sandbox/trajectory_controllers/manifest.xml
pkg/trunk/stacks/calibration/joint_states_settler/include/joint_states_settler/deflated_joint_states.h
pkg/trunk/stacks/calibration/joint_states_settler/include/joint_states_settler/joint_states_deflater.h
pkg/trunk/stacks/calibration/joint_states_settler/include/joint_states_settler/joint_states_settler.h
pkg/trunk/stacks/calibration/joint_states_settler/manifest.xml
pkg/trunk/stacks/calibration/joint_states_settler/src/joint_states_deflater.cpp
pkg/trunk/stacks/calibration/joint_states_settler/src/joint_states_settler.cpp
pkg/trunk/stacks/calibration/joint_states_settler/src/joint_states_settler_node.cpp
pkg/trunk/stacks/calibration/joint_states_settler/test/joint_states_deflater_unittest.cpp
pkg/trunk/stacks/calibration/joint_states_settler/test/joint_states_settler_unittest.cpp
pkg/trunk/stacks/laser_pipeline/dense_laser_assembler/include/dense_laser_assembler/dense_laser_msg_filter.h
pkg/trunk/stacks/laser_pipeline/dense_laser_assembler/include/dense_laser_assembler/joint_pv_msg_filter.h
pkg/trunk/stacks/laser_pipeline/dense_laser_assembler/manifest.xml
pkg/trunk/stacks/laser_pipeline/dense_laser_assembler/src/dense_laser_snapshotter.cpp
pkg/trunk/stacks/pr2/pr2_alpha/experimental_base_controller.launch
pkg/trunk/stacks/pr2/pr2_alpha/pr2_base_controller.launch
pkg/trunk/stacks/pr2/pr2_alpha/pr2_odometry.launch
pkg/trunk/stacks/pr2/pr2_alpha/pre.launch
pkg/trunk/stacks/pr2/pr2_alpha/prf.launch
pkg/trunk/stacks/pr2/pr2_alpha/prg.launch
pkg/trunk/stacks/pr2/pr2_alpha/teleop_base_spaceball.launch
pkg/trunk/stacks/pr2/pr2_alpha/teleop_controllers.launch
pkg/trunk/stacks/pr2/pr2_alpha/tilt_laser.launch
pkg/trunk/stacks/pr2/pr2_alpha/wheel_odometry_calibrate.launch
pkg/trunk/stacks/pr2/pr2_default_controllers/head_position_controller.launch
pkg/trunk/stacks/pr2/pr2_default_controllers/manifest.xml
pkg/trunk/stacks/pr2/pr2_default_controllers/pr2_base_controller_odom.launch
pkg/trunk/stacks/pr2/pr2_etherCAT/manifest.xml
pkg/trunk/stacks/pr2_common/pr2_msgs/manifest.xml
pkg/trunk/stacks/pr2_ethercat_drivers/ethercat_hardware/manifest.xml
pkg/trunk/stacks/pr2_mechanism/pr2_controller_interface/CMakeLists.txt
pkg/trunk/stacks/pr2_mechanism/pr2_controller_interface/manifest.xml
pkg/trunk/stacks/pr2_mechanism/pr2_hardware_interface/CMakeLists.txt
pkg/trunk/stacks/pr2_mechanism/pr2_hardware_interface/include/hardware_interface/hardware_interface.h
pkg/trunk/stacks/pr2_mechanism/pr2_hardware_interface/manifest.xml
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/CMakeLists.txt
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/include/mechanism_control/action_mechanism_control.h
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/include/mechanism_control/mechanism_control.h
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/include/mechanism_control/recorder.h
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/manifest.xml
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/scripts/mech.py
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/scripts/spawner.py
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/src/action_mechanism_control.cpp
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/src/mechanism_control/mechanism.py
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/src/mechanism_control.cpp
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/src/recorder.cpp
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/test/ms_publisher_test.cpp
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/test/test-mechanism-state-cpp.xml
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/test/test-mechanism-state-py.xml
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/CMakeLists.txt
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/include/mechanism_model/robot.h
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/manifest.xml
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/src/robot.cpp
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_msgs/CMakeLists.txt
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_msgs/manifest.xml
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_msgs/msg/JointStates.msg
pkg/trunk/stacks/pr2_simulator/gazebo_plugin/manifest.xml
pkg/trunk/stacks/robot_model/robot_state_publisher/include/robot_state_publisher/joint_state_listener.h
pkg/trunk/stacks/robot_model/robot_state_publisher/manifest.xml
pkg/trunk/stacks/robot_model/robot_state_publisher/src/joint_state_listener.cpp
pkg/trunk/stacks/robot_model/robot_state_publisher/src/state_publisher.cpp
pkg/trunk/stacks/semantic_mapping/door_handle_detector/launch/controllers.xml
pkg/trunk/stacks/semantic_mapping/door_handle_detector/launch/setup_for_recording.launch
pkg/trunk/stacks/semantic_mapping/door_handle_detector/test/launch/open_door.launch
pkg/trunk/stacks/semantic_mapping/door_handle_detector/test/launch/test_door_handle_detection.launch
pkg/trunk/stacks/trex/trex_pr2/cfg/launch_gazebo.xml
pkg/trunk/stacks/trex/trex_pr2/cfg/launch_gazebo_obstacle.xml
pkg/trunk/stacks/trex/trex_pr2/manifest.xml
pkg/trunk/stacks/trex/trex_pr2_writing_test/launch/controllers.launch
pkg/trunk/stacks/trex/trex_pr2_writing_test/launch/head_cart/controllers.launch
pkg/trunk/stacks/visual_feature_detectors/outlet_detection/launch/outlet_coarse_detection/controllers.launch
pkg/trunk/stacks/visual_feature_detectors/outlet_detection/launch/outlet_coarse_detection/controllers.launch~
Added Paths:
-----------
pkg/trunk/stacks/pr2_mechanism/pr2_controller_interface/
pkg/trunk/stacks/pr2_mechanism/pr2_hardware_interface/
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_control/
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_model/
pkg/trunk/stacks/pr2_mechanism/pr2_mechanism_msgs/
Removed Paths:
-------------
pkg/trunk/stacks/pr2_mechanism/controller_interface/
pkg/trunk/stacks/pr2_mechanism/hardware_interface/
pkg/trunk/stacks/pr2_mechanism/mechanism_control/
pkg/trunk/stacks/pr2_mechanism/mechanism_model/
pkg/trunk/stacks/pr2_mechanism/mechanism_msgs/
Modified: pkg/trunk/applications/2dnav_pr2_app/2dnav_pr2/config/base_odom_teleop.xml
===================================================================
--- pkg/trunk/applications/2dnav_pr2_app/2dnav_pr2/config/base_odom_teleop.xml 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/applications/2dnav_pr2_app/2dnav_pr2/config/base_odom_teleop.xml 2009-08-28 22:09:09 UTC (rev 23293)
@@ -4,7 +4,7 @@
<include file="$(find pr2_default_controllers)/pr2_base_controller_odom.launch"/>
<rosparam file="$(find pr2_default_controllers)/pr2_joint_velocity_controller.yaml" command="load"/>
-<node pkg="mechanism_control" type="spawner.py" args="torso_lift_velocity_controller" output="screen" />
+<node pkg="pr2_mechanism_control" type="spawner.py" args="torso_lift_velocity_controller" output="screen" />
<node pkg="backup_safetysound" type="backingup.py" machine="four" />
Modified: pkg/trunk/applications/2dnav_pr2_app/2dnav_pr2/config/lasers_and_filters.xml
===================================================================
--- pkg/trunk/applications/2dnav_pr2_app/2dnav_pr2/config/lasers_and_filters.xml 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/applications/2dnav_pr2_app/2dnav_pr2/config/lasers_and_filters.xml 2009-08-28 22:09:09 UTC (rev 23293)
@@ -7,7 +7,7 @@
<node pkg="mux" type="throttle" args="3.0 tilt_scan_filtered tilt_scan_filtered_throttled" />
<node pkg="mux" type="throttle" args="3.0 base_scan_marking base_scan_marking_throttled" />
-<node pkg="mechanism_control" type="spawner.py" args="$(find pr2_experimental_controllers)/laser_tilt/laser_tilt_controller.xml" />
+<node pkg="pr2_mechanism_control" type="spawner.py" args="$(find pr2_experimental_controllers)/laser_tilt/laser_tilt_controller.xml" />
<node pkg="pr2_mechanism_controllers" type="send_laser_traj_cmd_ms2.py" args="laser_tilt_controller" />
<!-- Filter for tilt laser shadowing/veiling -->
Modified: pkg/trunk/applications/2dnav_pr2_app/2dnav_pr2/manifest.xml
===================================================================
--- pkg/trunk/applications/2dnav_pr2_app/2dnav_pr2/manifest.xml 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/applications/2dnav_pr2_app/2dnav_pr2/manifest.xml 2009-08-28 22:09:09 UTC (rev 23293)
@@ -5,7 +5,7 @@
<review status="na" notes=""/>
<url>http://pr.willowgarage.com/wiki</url>
<depend package="amcl"/>
- <depend package="mechanism_control"/>
+ <depend package="pr2_mechanism_control"/>
<depend package="robot_pose_ekf"/>
<depend package="teleop_base"/>
<depend package="semantic_point_annotator"/>
Modified: pkg/trunk/calibration_experimental/joint_calibration_monitor/manifest.xml
===================================================================
--- pkg/trunk/calibration_experimental/joint_calibration_monitor/manifest.xml 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/calibration_experimental/joint_calibration_monitor/manifest.xml 2009-08-28 22:09:09 UTC (rev 23293)
@@ -12,6 +12,6 @@
<depend package="diagnostic_msgs" />
<!-- mechanism -->
- <depend package="mechanism_msgs" />
+ <depend package="pr2_mechanism_msgs" />
</package>
Modified: pkg/trunk/calibration_experimental/kinematic_calibration/demo/controllers.launch
===================================================================
--- pkg/trunk/calibration_experimental/kinematic_calibration/demo/controllers.launch 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/calibration_experimental/kinematic_calibration/demo/controllers.launch 2009-08-28 22:09:09 UTC (rev 23293)
@@ -16,7 +16,7 @@
<param name="right_arm_trajectory_controller/head_pan_joint/goal_reached_threshold" type="double" value="0.1"/>
<param name="right_arm_trajectory_controller/head_tilt_joint/goal_reached_threshold" type="double" value="0.1"/>
- <node pkg="mechanism_control" type="spawner.py" args="$(find kinematic_calibration)/demo/arm_head_traj_controller.xml" output="screen"/>
+ <node pkg="pr2_mechanism_control" type="spawner.py" args="$(find kinematic_calibration)/demo/arm_head_traj_controller.xml" output="screen"/>
<!-- Teleop Base -->
<!-- <include file="$(find pr2_alpha)/teleop_joystick.launch" /> -->
Modified: pkg/trunk/calibration_experimental/kinematic_calibration/demo/grab_cb_stereo_laser_robot.launch
===================================================================
--- pkg/trunk/calibration_experimental/kinematic_calibration/demo/grab_cb_stereo_laser_robot.launch 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/calibration_experimental/kinematic_calibration/demo/grab_cb_stereo_laser_robot.launch 2009-08-28 22:09:09 UTC (rev 23293)
@@ -29,7 +29,7 @@
<!-- *************** Laser Pipeline **************-->
<!-- Laser Controller -->
- <node pkg="mechanism_control" type="spawner.py"
+ <node pkg="pr2_mechanism_control" type="spawner.py"
args="$(find pr2_experimental_controllers)/laser_tilt/laser_tilt_controller.xml" respawn="false" output="screen"/>
<node pkg="pr2_mechanism_controllers" type="send_periodic_cmd_srv.py"
args="laser_tilt_controller linear 30 .75 .35"
Modified: pkg/trunk/calibration_experimental/kinematic_calibration/manifest.xml
===================================================================
--- pkg/trunk/calibration_experimental/kinematic_calibration/manifest.xml 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/calibration_experimental/kinematic_calibration/manifest.xml 2009-08-28 22:09:09 UTC (rev 23293)
@@ -6,7 +6,7 @@
<depend package="kdl" />
<depend package="phase_space" />
<depend package="geometry_msgs" />
- <depend package="mechanism_msgs" />
+ <depend package="pr2_mechanism_msgs" />
<depend package="mocap_msgs" />
<depend package="std_msgs" />
<depend package="topic_synchronizer" />
Modified: pkg/trunk/calibration_experimental/kinematic_calibration/src/arm_phasespace_grabber.cpp
===================================================================
--- pkg/trunk/calibration_experimental/kinematic_calibration/src/arm_phasespace_grabber.cpp 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/calibration_experimental/kinematic_calibration/src/arm_phasespace_grabber.cpp 2009-08-28 22:09:09 UTC (rev 23293)
@@ -37,7 +37,7 @@
#include "ros/node.h"
#include "ros/node_handle.h"
#include "boost/thread/mutex.hpp"
-#include "mechanism_msgs/MechanismState.h"
+#include "pr2_mechanism_msgs/MechanismState.h"
#include "mocap_msgs/MocapSnapshot.h"
#include "robot_kinematics/robot_kinematics.h"
@@ -279,7 +279,7 @@
{
// Grab mechanism state and put it in a local copy
mech_lock_.lock() ;
- mechanism_msgs::MechanismState mech_state = safe_mech_state_ ;
+ pr2_mechanism_msgs::MechanismState mech_state = safe_mech_state_ ;
mech_lock_.unlock() ;
angles.resize(names.size()) ;
@@ -313,12 +313,12 @@
private:
mocap_msgs::MocapSnapshot snapshot_ ;
- mechanism_msgs::MechanismState mech_state_ ;
+ pr2_mechanism_msgs::MechanismState mech_state_ ;
mocap_msgs::MocapSnapshot safe_snapshot_ ;
int marker_id_ ;
- mechanism_msgs::MechanismState safe_mech_state_ ;
+ pr2_mechanism_msgs::MechanismState safe_mech_state_ ;
boost::mutex mech_lock_ ;
boost::mutex snapshot_lock_ ;
Modified: pkg/trunk/calibration_experimental/kinematic_calibration/src/laser_head_grabber.cpp
===================================================================
--- pkg/trunk/calibration_experimental/kinematic_calibration/src/laser_head_grabber.cpp 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/calibration_experimental/kinematic_calibration/src/laser_head_grabber.cpp 2009-08-28 22:09:09 UTC (rev 23293)
@@ -36,7 +36,7 @@
#include "ros/node.h"
#include "boost/thread/mutex.hpp"
-#include "mechanism_msgs/MechanismState.h"
+#include "pr2_mechanism_msgs/MechanismState.h"
#include "topic_synchronizer/topic_synchronizer.h"
@@ -82,7 +82,7 @@
// Mechanism State
boost::mutex mech_state_lock_ ;
- ADD_MSG(mechanism_msgs::MechanismState, mech_state_) ;
+ ADD_MSG(pr2_mechanism_msgs::MechanismState, mech_state_) ;
// Stereo Messages
boost::mutex stereo_lock_ ;
Modified: pkg/trunk/calibration_experimental/kinematic_calibration/src/sensor_kinematics_grabber.cpp
===================================================================
--- pkg/trunk/calibration_experimental/kinematic_calibration/src/sensor_kinematics_grabber.cpp 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/calibration_experimental/kinematic_calibration/src/sensor_kinematics_grabber.cpp 2009-08-28 22:09:09 UTC (rev 23293)
@@ -36,7 +36,7 @@
#include "ros/node.h"
#include "boost/thread/mutex.hpp"
-#include "mechanism_msgs/MechanismState.h"
+#include "pr2_mechanism_msgs/MechanismState.h"
#include "mocap_msgs/MocapSnapshot.h"
#include "topic_synchronizer/topic_synchronizer.h"
@@ -79,8 +79,8 @@
TopicSynchronizer<SensorKinematicsGrabber> sync_ ;
// Mechanism State Messages
- mechanism_msgs::MechanismState mech_state_ ;
- mechanism_msgs::MechanismState safe_mech_state_ ;
+ pr2_mechanism_msgs::MechanismState mech_state_ ;
+ pr2_mechanism_msgs::MechanismState safe_mech_state_ ;
boost::mutex mech_state_lock_ ;
// Empty message used for callbacks
Modified: pkg/trunk/calibration_experimental/laser_camera_calibration/gatherdata.ros.xml
===================================================================
--- pkg/trunk/calibration_experimental/laser_camera_calibration/gatherdata.ros.xml 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/calibration_experimental/laser_camera_calibration/gatherdata.ros.xml 2009-08-28 22:09:09 UTC (rev 23293)
@@ -17,7 +17,7 @@
</group>
<!-- start nodding laser -->
- <node pkg="mechanism_control" type="spawner.py" args="$(find pr2_default_controllers)/laser_tilt_controller.xml" />
+ <node pkg="pr2_mechanism_control" type="spawner.py" args="$(find pr2_default_controllers)/laser_tilt_controller.xml" />
<node pkg="pr2_mechanism_controllers" type="send_periodic_cmd_srv.py" args="laser_tilt_controller linear 10 .4 .1" />
<!-- start the filtering node -->
Modified: pkg/trunk/calibration_experimental/laser_cb_processing/manifest.xml
===================================================================
--- pkg/trunk/calibration_experimental/laser_cb_processing/manifest.xml 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/calibration_experimental/laser_cb_processing/manifest.xml 2009-08-28 22:09:09 UTC (rev 23293)
@@ -23,8 +23,8 @@
<depend package="dense_laser_assembler" />
<!-- mechanism -->
- <depend package="mechanism_model" />
- <depend package="hardware_interface" />
+ <depend package="pr2_mechanism_model" />
+ <depend package="pr2_hardware_interface" />
</package>
Modified: pkg/trunk/calibration_experimental/optical_flag_calibration/controllers.launch
===================================================================
--- pkg/trunk/calibration_experimental/optical_flag_calibration/controllers.launch 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/calibration_experimental/optical_flag_calibration/controllers.launch 2009-08-28 22:09:09 UTC (rev 23293)
@@ -14,7 +14,7 @@
<param name="right_arm_trajectory_controller/r_wrist_roll_joint/goal_reached_threshold" type="double" value="0.1"/>
<param name="right_arm_trajectory_controller/r_gripper_l_finger_joint/goal_reached_threshold" type="double" value="0.1"/>
- <node pkg="mechanism_control" type="spawner.py" args="$(find kinematic_calibration)/demo/arm_traj_controller.xml" output="screen"/>
+ <node pkg="pr2_mechanism_control" type="spawner.py" args="$(find kinematic_calibration)/demo/arm_traj_controller.xml" output="screen"/>
<!-- Head Controller -->
<include file="$(find pr2_default_controllers)/head_position_controller.launch" />
Modified: pkg/trunk/calibration_experimental/sandbox/calibration_message_filters/include/calibration_message_filters/stationary_elem.h
===================================================================
--- pkg/trunk/calibration_experimental/sandbox/calibration_message_filters/include/calibration_message_filters/stationary_elem.h 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/calibration_experimental/sandbox/calibration_message_filters/include/calibration_message_filters/stationary_elem.h 2009-08-28 22:09:09 UTC (rev 23293)
@@ -39,7 +39,7 @@
{
#include "boost/shared_ptr.hpp"
-#include "mechanism_msgs/MechanismState.h"
+#include "pr2_mechanism_msgs/MechanismState.h"
/**
* Output type for the sandwich filter. Stores some message type M,
@@ -51,7 +51,7 @@
struct StationaryElem
{
boost::shared_ptr<const M> data;
- mechanism_msgs::MechanismStatePtr mech_state;
+ pr2_mechanism_msgs::MechanismStatePtr mech_state;
};
}
Modified: pkg/trunk/calibration_experimental/sandbox/calibration_message_filters/include/calibration_message_filters/stationary_filter.h
===================================================================
--- pkg/trunk/calibration_experimental/sandbox/calibration_message_filters/include/calibration_message_filters/stationary_filter.h 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/calibration_experimental/sandbox/calibration_message_filters/include/calibration_message_filters/stationary_filter.h 2009-08-28 22:09:09 UTC (rev 23293)
@@ -39,7 +39,7 @@
#include "calibration_message_filters/stationary_elem.h"
#include "calibration_message_filters/joint_tolerance.h"
-#include "mechanism_msgs/MechanismState.h"
+#include "pr2_mechanism_msgs/MechanismState.h"
namespace calibration_message_filters
{
@@ -53,7 +53,7 @@
class StationaryFilter
{
public:
- typedef boost::shared_ptr< SandwichElem<M, mechanism_msgs::JointStates> > SandConstPtr; // Shared pointer to the sandwich elem
+ typedef boost::shared_ptr< SandwichElem<M, pr2_mechanism_msgs::JointStates> > SandConstPtr; // Shared pointer to the sandwich elem
typedef boost::function<void(const StationaryElem<M>&)> Callback;
typedef boost::signal<Callback> Signal;
Modified: pkg/trunk/calibration_experimental/sandbox/calibration_message_filters/manifest.xml
===================================================================
--- pkg/trunk/calibration_experimental/sandbox/calibration_message_filters/manifest.xml 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/calibration_experimental/sandbox/calibration_message_filters/manifest.xml 2009-08-28 22:09:09 UTC (rev 23293)
@@ -9,7 +9,7 @@
<depend package="message_filters" />
<!-- mechanism -->
- <depend package="mechanism_msgs" />
+ <depend package="pr2_mechanism_msgs" />
<export>
<cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -lcalibration_message_filters" />
Modified: pkg/trunk/calibration_experimental/sandbox/laser_head_updater/manifest.xml
===================================================================
--- pkg/trunk/calibration_experimental/sandbox/laser_head_updater/manifest.xml 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/calibration_experimental/sandbox/laser_head_updater/manifest.xml 2009-08-28 22:09:09 UTC (rev 23293)
@@ -13,7 +13,7 @@
<depend package="tf" />
<!-- mechanism -->
- <depend package="mechanism_msgs" />
+ <depend package="pr2_mechanism_msgs" />
<!-- common -->
<depend package="laser_scan" />
Modified: pkg/trunk/calibration_experimental/sandbox/laser_head_updater/src/publish_laser_head_tf.cpp
===================================================================
--- pkg/trunk/calibration_experimental/sandbox/laser_head_updater/src/publish_laser_head_tf.cpp 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/calibration_experimental/sandbox/laser_head_updater/src/publish_laser_head_tf.cpp 2009-08-28 22:09:09 UTC (rev 23293)
@@ -38,7 +38,7 @@
#include "ros/ros.h"
#include "tf/tfMessage.h"
#include "tf/transform_datatypes.h"
-#include "mechanism_msgs/MechanismState.h"
+#include "pr2_mechanism_msgs/MechanismState.h"
#include "sensor_msgs/LaserScan.h"
#include "stereo_msgs/RawStereo.h"
@@ -128,7 +128,7 @@
after_tilt_T_ = buildTransform(after_tilt) ;
}
- double getJointPos(const mechanism_msgs::MechanismStateConstPtr& mech_state,
+ double getJointPos(const pr2_mechanism_msgs::MechanismStateConstPtr& mech_state,
const std::string& name)
{
for(unsigned int i=0; i<mech_state->joint_states.size(); i++)
@@ -142,7 +142,7 @@
}
- void updateTf(const mechanism_msgs::MechanismStateConstPtr& mech_state)
+ void updateTf(const pr2_mechanism_msgs::MechanismStateConstPtr& mech_state)
{
//printf("In callback\n") ;
Modified: pkg/trunk/calibration_experimental/sandbox/laser_head_updater/src/publish_laser_head_tf_pre.cpp
===================================================================
--- pkg/trunk/calibration_experimental/sandbox/laser_head_updater/src/publish_laser_head_tf_pre.cpp 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/calibration_experimental/sandbox/laser_head_updater/src/publish_laser_head_tf_pre.cpp 2009-08-28 22:09:09 UTC (rev 23293)
@@ -38,7 +38,7 @@
#include "ros/ros.h"
#include "tf/tfMessage.h"
#include "tf/transform_datatypes.h"
-#include "mechanism_msgs/MechanismState.h"
+#include "pr2_mechanism_msgs/MechanismState.h"
#include "sensor_msgs/LaserScan.h"
#include "stereo_msgs/RawStereo.h"
@@ -132,7 +132,7 @@
after_tilt_T_ = buildTransform(after_tilt) ;
}
- double getJointPos(const mechanism_msgs::MechanismStateConstPtr& mech_state,
+ double getJointPos(const pr2_mechanism_msgs::MechanismStateConstPtr& mech_state,
const std::string& name)
{
for(unsigned int i=0; i<mech_state->joint_states.size(); i++)
@@ -146,7 +146,7 @@
}
- void updateTf(const mechanism_msgs::MechanismStateConstPtr& mech_state)
+ void updateTf(const pr2_mechanism_msgs::MechanismStateConstPtr& mech_state)
{
//printf("In callback\n") ;
Modified: pkg/trunk/calibration_experimental/sandbox/laser_head_updater/src/publish_laser_head_tf_prg.cpp
===================================================================
--- pkg/trunk/calibration_experimental/sandbox/laser_head_updater/src/publish_laser_head_tf_prg.cpp 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/calibration_experimental/sandbox/laser_head_updater/src/publish_laser_head_tf_prg.cpp 2009-08-28 22:09:09 UTC (rev 23293)
@@ -38,7 +38,7 @@
#include "ros/ros.h"
#include "tf/tfMessage.h"
#include "tf/transform_datatypes.h"
-#include "mechanism_msgs/MechanismState.h"
+#include "pr2_mechanism_msgs/MechanismState.h"
#include "sensor_msgs/LaserScan.h"
#include "stereo_msgs/RawStereo.h"
@@ -131,7 +131,7 @@
after_tilt_T_ = buildTransform(after_tilt) ;
}
- double getJointPos(const mechanism_msgs::MechanismStateConstPtr& mech_state,
+ double getJointPos(const pr2_mechanism_msgs::MechanismStateConstPtr& mech_state,
const std::string& name)
{
for(unsigned int i=0; i<mech_state->joint_states.size(); i++)
@@ -145,7 +145,7 @@
}
- void updateTf(const mechanism_msgs::MechanismStateConstPtr& mech_state)
+ void updateTf(const pr2_mechanism_msgs::MechanismStateConstPtr& mech_state)
{
//printf("In callback\n") ;
Modified: pkg/trunk/calibration_experimental/sandbox/pr2_calibration_actions/include/pr2_calibration_actions/capture_hand_led.h
===================================================================
--- pkg/trunk/calibration_experimental/sandbox/pr2_calibration_actions/include/pr2_calibration_actions/capture_hand_led.h 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/calibration_experimental/sandbox/pr2_calibration_actions/include/pr2_calibration_actions/capture_hand_led.h 2009-08-28 22:09:09 UTC (rev 23293)
@@ -46,7 +46,7 @@
#include "calibration_message_filters/stationary_checker.h"
// msgs
-#include "mechanism_msgs/JointStates.h"
+#include "pr2_mechanism_msgs/JointStates.h"
namespace pr2_calibration_actions
{
@@ -73,7 +73,7 @@
message_filters::Cache<DeflatedImage> led_cache_;
// ***** JointStates Stuff *****
- typedef calibration_message_filters::DeflatedMsg<mechanism_msgs::JointStates> DeflatedJointStates;
+ typedef calibration_message_filters::DeflatedMsg<pr2_mechanism_msgs::JointStates> DeflatedJointStates;
typedef boost::shared_ptr<DeflatedJointStates> DeflatedJointStatesPtr;
typedef boost::shared_ptr<const DeflatedJointStates> DeflatedJointStatesConstPtr;
@@ -87,7 +87,7 @@
// ***** Implementation *****
void ledCallback(const calibration_msgs::ImagePointStampedConstPtr& led,
const sensor_msgs::ImageConstPtr& led_image);
- void jointStatesCallback(const mechanism_msgs::JointStatesConstPtr& joint_states);
+ void jointStatesCallback(const pr2_mechanism_msgs::JointStatesConstPtr& joint_states);
void checkStationary();
};
Modified: pkg/trunk/calibration_experimental/sandbox/pr2_calibration_actions/include/pr2_calibration_actions/joint_states_channel.h
===================================================================
--- pkg/trunk/calibration_experimental/sandbox/pr2_calibration_actions/include/pr2_calibration_actions/joint_states_channel.h 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/calibration_experimental/sandbox/pr2_calibration_actions/include/pr2_calibration_actions/joint_states_channel.h 2009-08-28 22:09:09 UTC (rev 23293)
@@ -47,7 +47,7 @@
#include "pr2_calibration_actions/JointStatesChannelConfig.h"
#include "pr2_calibration_actions/JointStatesChannelResult.h"
#include "pr2_calibration_actions/ChannelFeedback.h"
-#include "mechanism_msgs/JointStates.h"
+#include "pr2_mechanism_msgs/JointStates.h"
namespace pr2_calibration_actions
{
@@ -55,7 +55,7 @@
class JointStatesChannel : public GenericChannel
{
public:
- typedef calibration_message_filters::DeflatedMsg<mechanism_msgs::JointStates> DeflatedJointStates;
+ typedef calibration_message_filters::DeflatedMsg<pr2_mechanism_msgs::JointStates> DeflatedJointStates;
typedef boost::function <void(const DeflatedJointStates&)> StationaryCallback;
JointStatesChannel(const JointStatesChannelConfig& config, StationaryCallback cb = NULL);
@@ -75,7 +75,7 @@
StationaryCallback stationary_callback_;
calibration_message_filters::JointStatesDeflater deflater_;
- void jointStatesCallback(const mechanism_msgs::JointStatesConstPtr& msg);
+ void jointStatesCallback(const pr2_mechanism_msgs::JointStatesConstPtr& msg);
};
Modified: pkg/trunk/calibration_experimental/sandbox/pr2_calibration_actions/include/pr2_calibration_actions/robot_pixels_capture.h
===================================================================
--- pkg/trunk/calibration_experimental/sandbox/pr2_calibration_actions/include/pr2_calibration_actions/robot_pixels_capture.h 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/calibration_experimental/sandbox/pr2_calibration_actions/include/pr2_calibration_actions/robot_pixels_capture.h 2009-08-28 22:09:09 UTC (rev 23293)
@@ -49,7 +49,7 @@
class RobotPixelsCapture
{
public:
- typedef calibration_message_filters::DeflatedMsg<mechanism_msgs::JointStates> DeflatedJointStates;
+ typedef calibration_message_filters::DeflatedMsg<pr2_mechanism_msgs::JointStates> DeflatedJointStates;
typedef calibration_message_filters::DeflatedMsg<sensor_msgs::Image> DeflatedImage;
typedef boost::function<void(const CaptureRobotPixelsResult&)> CompletionCallback;
typedef boost::function<void(const CaptureRobotPixelsFeedback&)> FeedbackCallback;
Modified: pkg/trunk/calibration_experimental/sandbox/pr2_calibration_actions/manifest.xml
===================================================================
--- pkg/trunk/calibration_experimental/sandbox/pr2_calibration_actions/manifest.xml 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/calibration_experimental/sandbox/pr2_calibration_actions/manifest.xml 2009-08-28 22:09:09 UTC (rev 23293)
@@ -21,7 +21,7 @@
<depend package="actionlib" />
<!-- mechanism -->
- <depend package="mechanism_msgs" />
+ <depend package="pr2_mechanism_msgs" />
<!-- calibration -->
<depend package="calibration_msgs" />
Modified: pkg/trunk/calibration_experimental/sandbox/pr2_calibration_actions/src/capture_hand_led.cpp
===================================================================
--- pkg/trunk/calibration_experimental/sandbox/pr2_calibration_actions/src/capture_hand_led.cpp 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/calibration_experimental/sandbox/pr2_calibration_actions/src/capture_hand_led.cpp 2009-08-28 22:09:09 UTC (rev 23293)
@@ -98,7 +98,7 @@
checkStationary();
}
-void CaptureHandLED::jointStatesCallback(const mechanism_msgs::JointStatesConstPtr& joint_states)
+void CaptureHandLED::jointStatesCallback(const pr2_mechanism_msgs::JointStatesConstPtr& joint_states)
{
DeflatedJointStatesPtr deflated_ptr(new DeflatedJointStates);
joint_states_deflater_.deflate(joint_states, *deflated_ptr);
Modified: pkg/trunk/calibration_experimental/sandbox/pr2_calibration_actions/src/joint_states_channel.cpp
===================================================================
--- pkg/trunk/calibration_experimental/sandbox/pr2_calibration_actions/src/joint_states_channel.cpp 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/calibration_experimental/sandbox/pr2_calibration_actions/src/joint_states_channel.cpp 2009-08-28 22:09:09 UTC (rev 23293)
@@ -76,7 +76,7 @@
stationary_callback_ = cb;
}
-void JointStatesChannel::jointStatesCallback(const mechanism_msgs::JointStatesConstPtr& msg)
+void JointStatesChannel::jointStatesCallback(const pr2_mechanism_msgs::JointStatesConstPtr& msg)
{
DeflatedJointStates deflated;
deflater_.deflate(msg, deflated);
Modified: pkg/trunk/controllers/mechanism_controller_test/manifest.xml
===================================================================
--- pkg/trunk/controllers/mechanism_controller_test/manifest.xml 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/controllers/mechanism_controller_test/manifest.xml 2009-08-28 22:09:09 UTC (rev 23293)
@@ -6,8 +6,8 @@
<license>BSD</license>
<review status="unreviewed" notes=""/>
<depend package="roscpp" />
- <depend package="hardware_interface" />
- <depend package="mechanism_control" />
+ <depend package="pr2_hardware_interface" />
+ <depend package="pr2_mechanism_control" />
<!-- The controllers packages for testing -->
<!--<depend package="robot_mechanism_controllers" />-->
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/head_position_controller.h
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/head_position_controller.h 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/include/pr2_mechanism_controllers/head_position_controller.h 2009-08-28 22:09:09 UTC (rev 23293)
@@ -46,7 +46,7 @@
#include <tf/message_notifier.h>
#include <tf/transform_datatypes.h>
#include <robot_mechanism_controllers/joint_position_controller.h>
-#include <mechanism_msgs/JointStates.h>
+#include <pr2_mechanism_msgs/JointStates.h>
#include <geometry_msgs/PointStamped.h>
#include <boost/scoped_ptr.hpp>
@@ -73,7 +73,7 @@
mechanism::RobotState *robot_state_;
ros::Subscriber sub_command_;
- void command(const mechanism_msgs::JointStatesConstPtr& command_msg);
+ void command(const pr2_mechanism_msgs::JointStatesConstPtr& command_msg);
void pointHead(const tf::MessageNotifier<geometry_msgs::PointStamped>::MessagePtr& point_msg);
void pointFrameOnHead(const tf::MessageNotifier<geometry_msgs::PointStamped>::MessagePtr& point_msg);
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/manifest.xml
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/manifest.xml 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/manifest.xml 2009-08-28 22:09:09 UTC (rev 23293)
@@ -11,17 +11,17 @@
<!-- ROS Interfaces -->
<depend package="std_msgs" />
<depend package="geometry_msgs" />
- <depend package="mechanism_msgs" />
+ <depend package="pr2_mechanism_msgs" />
<depend package="nav_msgs" />
<depend package="pr2_msgs" />
<depend package="visualization_msgs" />
<depend package="diagnostic_msgs" />
<!-- Plugins -->
- <depend package="controller_interface" />
+ <depend package="pr2_controller_interface" />
<depend package="roscpp" />
- <depend package="mechanism_model" />
+ <depend package="pr2_mechanism_model" />
<depend package="realtime_tools" />
<depend package="robot_mechanism_controllers" />
<depend package="rospy" />
@@ -33,14 +33,14 @@
<depend package="control_toolbox" />
<depend package="filters" />
<depend package="diagnostic_updater" />
- <depend package="mechanism_control" />
+ <depend package="pr2_mechanism_control" />
<url>http://pr.willowgarage.com</url>
<repository>http://pr.willowgarage.com/repos</repository>
<export>
<cpp cflags="-I${prefix}/include -I${prefix}/msg/cpp -I${prefix}/srv/cpp"
lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lpr2_mechanism_controllers" />
- <controller_interface plugin="${prefix}/controller_plugins.xml" />
+ <pr2_controller_interface plugin="${prefix}/controller_plugins.xml" />
</export>
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/src/head_position_controller.cpp
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/src/head_position_controller.cpp 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/src/head_position_controller.cpp 2009-08-28 22:09:09 UTC (rev 23293)
@@ -84,7 +84,7 @@
// subscribe to head commands
- sub_command_ = node_.subscribe<mechanism_msgs::JointStates>("command", 1, &HeadPositionController::command, this);
+ sub_command_ = node_.subscribe<pr2_mechanism_msgs::JointStates>("command", 1, &HeadPositionController::command, this);
point_head_notifier_.reset(new MessageNotifier<geometry_msgs::PointStamped>(tf_,
boost::bind(&HeadPositionController::pointHead, this, _1),
@@ -114,7 +114,7 @@
head_tilt_controller_.update();
}
-void HeadPositionController::command(const mechanism_msgs::JointStatesConstPtr& command_msg)
+void HeadPositionController::command(const pr2_mechanism_msgs::JointStatesConstPtr& command_msg)
{
assert(command_msg->joints.size() == 2);
Modified: pkg/trunk/controllers/robot_mechanism_controllers/manifest.xml
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/manifest.xml 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/controllers/robot_mechanism_controllers/manifest.xml 2009-08-28 22:09:09 UTC (rev 23293)
@@ -6,9 +6,9 @@
<review status="unreviewed" notes=""/>
<depend package="kdl_parser"/>
<depend package="rospy"/>
- <depend package="controller_interface" />
- <depend package="mechanism_model" />
- <depend package="mechanism_control" />
+ <depend package="pr2_controller_interface" />
+ <depend package="pr2_mechanism_model" />
+ <depend package="pr2_mechanism_control" />
<depend package="control_toolbox" />
<depend package="realtime_tools" />
<depend package="roscpp" />
@@ -25,7 +25,7 @@
<export>
<cpp cflags="-I${prefix}/include -I${prefix}/msg/cpp -I${prefix}/srv/cpp"
lflags="-Wl,-rpath,${prefix}/lib/ -L${prefix}/lib -lrobot_mechanism_controllers" />
- <controller_interface plugin="${prefix}/controller_plugins.xml" />
+ <pr2_controller_interface plugin="${prefix}/controller_plugins.xml" />
</export>
<rosdep name="libtool"/>
</package>
Modified: pkg/trunk/demos/2dnav_gazebo/config/lasers_and_filters.launch
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/config/lasers_and_filters.launch 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/demos/2dnav_gazebo/config/lasers_and_filters.launch 2009-08-28 22:09:09 UTC (rev 23293)
@@ -2,7 +2,7 @@
<include file="$(find 3dnav_pr2)/launch/pr2_planning_environment.launch" />
-<node pkg="mechanism_control" type="spawner.py" args="$(find pr2_experimental_controllers)/laser_tilt/laser_tilt_controller.xml" />
+<node pkg="pr2_mechanism_control" type="spawner.py" args="$(find pr2_experimental_controllers)/laser_tilt/laser_tilt_controller.xml" />
<node pkg="pr2_mechanism_controllers" type="send_periodic_cmd.py" args="laser_tilt_controller linear 2 .65 .25" />
<!-- filter robot self -->
Modified: pkg/trunk/demos/2dnav_gazebo/config/tuck_arms.launch
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/config/tuck_arms.launch 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/demos/2dnav_gazebo/config/tuck_arms.launch 2009-08-28 22:09:09 UTC (rev 23293)
@@ -1,6 +1,6 @@
<launch>
<!-- Tug Arms For Navigation -->
- <node pkg="mechanism_control" type="spawner.py" args="$(find arm_gazebo)/l_arm_default_controller.xml" output="screen" machine="four" />
- <node pkg="mechanism_control" type="spawner.py" args="$(find arm_gazebo)/r_arm_default_controller.xml" output="screen" machine="four" />
+ <node pkg="pr2_mechanism_control" type="spawner.py" args="$(find arm_gazebo)/l_arm_default_controller.xml" output="screen" machine="four" />
+ <node pkg="pr2_mechanism_control" type="spawner.py" args="$(find arm_gazebo)/r_arm_default_controller.xml" output="screen" machine="four" />
<node pkg="pr2_gazebo" type="tuck_arms.py" output="screen"/>
</launch>
Modified: pkg/trunk/demos/arm_gazebo/controllers/l_arm_position_controller.launch
===================================================================
--- pkg/trunk/demos/arm_gazebo/controllers/l_arm_position_controller.launch 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/demos/arm_gazebo/controllers/l_arm_position_controller.launch 2009-08-28 22:09:09 UTC (rev 23293)
@@ -1,6 +1,6 @@
<launch>
<!-- arm controller -->
<rosparam file="$(find pr2_default_controllers)/pr2_joint_position_controllers.yaml" command="load" />
- <node pkg="mechanism_control" type="spawner.py" args="l_shoulder_pan_position_controller l_shoulder_lift_position_controller l_upper_arm_roll_position_controller l_elbow_flex_position_controller l_forearm_roll_position_controller l_wrist_flex_position_controller l_wrist_roll_position_controller l_gripper_position_controller" output="screen"/>
+ <node pkg="pr2_mechanism_control" type="spawner.py" args="l_shoulder_pan_position_controller l_shoulder_lift_position_controller l_upper_arm_roll_position_controller l_elbow_flex_position_controller l_forearm_roll_position_controller l_wrist_flex_position_controller l_wrist_roll_position_controller l_gripper_position_controller" output="screen"/>
</launch>
Modified: pkg/trunk/demos/arm_gazebo/controllers/r_arm_position_controller.launch
===================================================================
--- pkg/trunk/demos/arm_gazebo/controllers/r_arm_position_controller.launch 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/demos/arm_gazebo/controllers/r_arm_position_controller.launch 2009-08-28 22:09:09 UTC (rev 23293)
@@ -1,5 +1,5 @@
<launch>
<!-- arm controller -->
<rosparam file="$(find pr2_default_controllers)/pr2_joint_position_controllers.yaml" command="load" />
- <node pkg="mechanism_control" type="spawner.py" args="r_shoulder_pan_position_controller r_shoulder_lift_position_controller r_upper_arm_roll_position_controller r_elbow_flex_position_controller r_forearm_roll_position_controller r_wrist_flex_position_controller r_wrist_roll_position_controller r_gripper_position_controller" output="screen"/>
+ <node pkg="pr2_mechanism_control" type="spawner.py" args="r_shoulder_pan_position_controller r_shoulder_lift_position_controller r_upper_arm_roll_position_controller r_elbow_flex_position_controller r_forearm_roll_position_controller r_wrist_flex_position_controller r_wrist_roll_position_controller r_gripper_position_controller" output="screen"/>
</launch>
Modified: pkg/trunk/demos/arm_gazebo/tests/r_arm_constraint.launch
===================================================================
--- pkg/trunk/demos/arm_gazebo/tests/r_arm_constraint.launch 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/demos/arm_gazebo/tests/r_arm_constraint.launch 2009-08-28 22:09:09 UTC (rev 23293)
@@ -23,7 +23,7 @@
<!-- start arm controller -->
<!--
- <node pkg="mechanism_control" type="spawner.py" args="$(find arm_gazebo)/r_arm_constraint_controller.xml" respawn="false" />
+ <node pkg="pr2_mechanism_control" type="spawner.py" args="$(find arm_gazebo)/r_arm_constraint_controller.xml" respawn="false" />
-->
Modified: pkg/trunk/demos/door_demos/launch/2dnav_pr2_door.launch
===================================================================
--- pkg/trunk/demos/door_demos/launch/2dnav_pr2_door.launch 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/demos/door_demos/launch/2dnav_pr2_door.launch 2009-08-28 22:09:09 UTC (rev 23293)
@@ -5,8 +5,8 @@
<include file="$(find pr2_alpha)/$(env ROBOT).machine" />
- <!-- node pkg="mechanism_control" type="spawner.py" args="$(find pr2_default_controllers)/base_controller.xml" />
- <node pkg="mechanism_control" type="spawner.py" args="$(find pr2_default_controllers)/laser_tilt_controller.xml" />
+ <!-- node pkg="pr2_mechanism_control" type="spawner.py" args="$(find pr2_default_controllers)/base_controller.xml" />
+ <node pkg="pr2_mechanism_control" type="spawner.py" args="$(find pr2_default_controllers)/laser_tilt_controller.xml" />
<node pkg="pr2_mechanism_controllers" type="send_periodic_cmd_srv.py" args="laser_tilt_controller linear 2 .75 .30" />-->
<!-- Filter for tilt laser shadowing/veiling -->
Modified: pkg/trunk/demos/door_demos/launch/base_trajectory_controller.launch
===================================================================
--- pkg/trunk/demos/door_demos/launch/base_trajectory_controller.launch 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/demos/door_demos/launch/base_trajectory_controller.launch 2009-08-28 22:09:09 UTC (rev 23293)
@@ -9,6 +9,6 @@
<param name="base/trajectory_controller/base_y/goal_reached_threshold" type="double" value="0.1"/>
<param name="base/trajectory_controller/base_theta/goal_reached_threshold" type="double" value="0.2"/>
-<node pkg="mechanism_control" type="spawner.py" args="$(find door_demos)/controllers/base_trajectory_controller.xml" output="screen"/>
+<node pkg="pr2_mechanism_control" type="spawner.py" args="$(find door_demos)/controllers/base_trajectory_controller.xml" output="screen"/>
</launch>
Modified: pkg/trunk/demos/door_demos/launch/joint_trajectory_controller.launch
===================================================================
--- pkg/trunk/demos/door_demos/launch/joint_trajectory_controller.launch 2009-08-28 22:05:37 UTC (rev 23292)
+++ pkg/trunk/demos/door_demos/launch/joint_trajectory_controller.launch 2009-08-28 22:09:09 UTC (rev 23293)
@@ -9,6 +9,6 @@
<param name="base/trajectory_controller/base_y/goal_reached_threshold" type="double" value="0.1"/>
<param name="base/trajectory_controller/base_theta/goal_reached_threshold" type="double" value="0.2"/>
-<node pkg="mechanism_control" type="spawner.py" args="$(find door_demos)/controllers/joint_trajectory_controller.xml" output="screen"/>
+<n...
[truncated message content] |
