Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[23749] pkg/trunk
|
From: <hsu...@us...> - 2009-09-03 04:26:46
|
Revision: 23749
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=23749&view=rev
Author: hsujohnhsu
Date: 2009-09-03 04:26:27 +0000 (Thu, 03 Sep 2009)
Log Message:
-----------
package reorganization, renaming for simulator_gazebo and pr2_simulator stack
* ikea_objects, ikea_ogre --> simulator_gazebo stack : generic objects for simulation
* gazebo_worlds --> simulator_gazebo stack : no pr2 related dependencies
* arm_gazebo --> pr2_simulator/pr2_arm_gazebo : add pr2 prefix
* examples_gazebo --> pr2_simulator/pr2_examples_gazebo : add pr2 prefix
* 2dnav_gazebo --> pr2_simulator/pr2_2dnav_gazebo : add pr2 prefix
* test_2dnav_gazebo --> pr2_simulator/test_pr2_2dnav_gazebo : add pr2 prefix
* test_pr2_*_gazebo --> pr2_simulator stack : relocating
* gazebo_plugin --> pr2_gazebo_plugins : rename, add pr2 prefix
* test_gazebo_plugin --> test_pr2_gazebo_plugins : add pr2 prefix
* pr2_gazebo --> pr2_simulator stack : relocating
Modified Paths:
--------------
pkg/trunk/demos/door_demos_gazebo/launch/open_door_test.launch
pkg/trunk/demos/erratic_gazebo/erratic_demo.launch
pkg/trunk/demos/erratic_gazebo/manifest.xml
pkg/trunk/robot_descriptions/pr2/pr2_experimental_controllers/constraint_controllers/demo_constraint.launch
pkg/trunk/sandbox/dynamics_estimation/r_arm.launch
pkg/trunk/sandbox/teleop_anti_collision/launch/test_teleop_anti_collision.xml
pkg/trunk/sandbox/webteleop/launch/gazebo.launch
pkg/trunk/stacks/pr2/pr2_alpha/prf_sim.launch
pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/2dnav-stack-fake_localization.launch
pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/config/tuck_arms.launch
pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/doc.dox
pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/manifest.xml
pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/pr2-empty-amcl.launch
pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/pr2-empty-fake_localization.launch
pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/pr2-simple-fake_localization.launch
pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/pr2-wg-amcl.launch
pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/prototype1-simple-amcl.launch
pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/prototype1-wg-fake_localization.launch
pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/trex/run_milestone_1_gazebo.xml
pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/trex/run_milestone_1_gazebo_empty.xml
pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/l_arm.launch
pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/l_gripper.launch
pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/manifest.xml
pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/r_arm.launch
pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/r_arm_grasping_demo.launch
pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/r_gripper.launch
pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/scripts/grasp_preprogrammed.py
pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/scripts/l_arm_max.py
pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/scripts/l_arm_min.py
pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/scripts/l_arm_test.py
pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/scripts/l_arm_test_random.py
pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/scripts/test_launch_order.tcsh
pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/tests/r_arm_constraint.launch
pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/tests/r_arm_spacenav.launch
pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/dual_link.launch
pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/dual_link_defs/Makefile
pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/dual_link_defs/send_description.launch
pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/manifest.xml
pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/multi_link.launch
pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/multi_link_defs/Makefile
pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/multi_link_defs/send_description.launch
pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/simple_box.launch
pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/simple_cylinder.launch
pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/simple_sphere.launch
pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/single_link.launch
pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/single_link_defs/Makefile
pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/single_link_defs/send_description.launch
pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/table.launch
pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/table_defs/Makefile
pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/table_defs/table.xml
pkg/trunk/stacks/pr2_simulator/pr2_gazebo/manifest.xml
pkg/trunk/stacks/pr2_simulator/pr2_gazebo/map_building_demo.launch
pkg/trunk/stacks/pr2_simulator/pr2_gazebo/pr2_default_controllers.launch
pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/CMakeLists.txt
pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/doc.dox
pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/include/pr2_gazebo_plugins/gazebo_battery.h
pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/include/pr2_gazebo_plugins/gazebo_mechanism_control.h
pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/manifest.xml
pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/src/gazebo_battery.cpp
pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/src/gazebo_mechanism_control.cpp
pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/src/ros_block_laser.cpp
pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/src/ros_bumper.cpp
pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/src/ros_camera.cpp
pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/src/ros_f3d.cpp
pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/src/ros_force.cpp
pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/src/ros_joint_force.cpp
pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/src/ros_laser.cpp
pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/src/ros_p3d.cpp
pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/src/ros_prosilica.cpp
pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/src/ros_sim_iface.cpp
pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/src/ros_stereo_camera.cpp
pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/src/ros_template.cpp
pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/src/ros_time.cpp
pkg/trunk/stacks/pr2_simulator/test_pr2_2dnav_gazebo/CMakeLists.txt
pkg/trunk/stacks/pr2_simulator/test_pr2_2dnav_gazebo/manifest.xml
pkg/trunk/stacks/pr2_simulator/test_pr2_2dnav_gazebo/set_goal.py
pkg/trunk/stacks/pr2_simulator/test_pr2_2dnav_gazebo/test_2dnav_empty_amcl_axis.launch
pkg/trunk/stacks/pr2_simulator/test_pr2_2dnav_gazebo/test_2dnav_empty_axis.launch
pkg/trunk/stacks/pr2_simulator/test_pr2_2dnav_gazebo/test_2dnav_empty_diagonal.launch
pkg/trunk/stacks/pr2_simulator/test_pr2_2dnav_gazebo/test_2dnav_empty_odom.launch
pkg/trunk/stacks/pr2_simulator/test_pr2_2dnav_gazebo/test_2dnav_empty_rotation.launch
pkg/trunk/stacks/pr2_simulator/test_pr2_2dnav_gazebo/test_2dnav_wg.launch
pkg/trunk/stacks/pr2_simulator/test_pr2_collision_gazebo/manifest.xml
pkg/trunk/stacks/pr2_simulator/test_pr2_collision_gazebo/test_slide.launch
pkg/trunk/stacks/pr2_simulator/test_pr2_gazebo_plugins/CMakeLists.txt
pkg/trunk/stacks/pr2_simulator/test_pr2_gazebo_plugins/manifest.xml
pkg/trunk/stacks/pr2_simulator/test_pr2_gazebo_plugins/test_pendulum.launch
pkg/trunk/stacks/pr2_simulator/test_pr2_gazebo_plugins/test_pendulum.py
pkg/trunk/stacks/pr2_simulator/test_pr2_mechanism_controllers_gazebo/manifest.xml
pkg/trunk/stacks/pr2_simulator/test_pr2_mechanism_controllers_gazebo/test_arm.launch
pkg/trunk/stacks/pr2_simulator/test_pr2_sensors_gazebo/manifest.xml
pkg/trunk/stacks/simulator_gazebo/gazebo/launch/balcony_world.launch
pkg/trunk/stacks/simulator_gazebo/gazebo/launch/camera_world.launch
pkg/trunk/stacks/simulator_gazebo/gazebo/launch/debug.launch
pkg/trunk/stacks/simulator_gazebo/gazebo/launch/empty_world.launch
pkg/trunk/stacks/simulator_gazebo/gazebo/launch/empty_world_no_x.launch
pkg/trunk/stacks/simulator_gazebo/gazebo/launch/office_world.launch
pkg/trunk/stacks/simulator_gazebo/gazebo/launch/scan_world.launch
pkg/trunk/stacks/simulator_gazebo/gazebo/launch/simple_world.launch
pkg/trunk/stacks/simulator_gazebo/gazebo/launch/slide_world.launch
pkg/trunk/stacks/simulator_gazebo/gazebo/launch/wg_world.launch
pkg/trunk/stacks/simulator_gazebo/gazebo/quick_gazebo.sh
pkg/trunk/stacks/simulator_gazebo/gazebo/setup.bash
pkg/trunk/stacks/simulator_gazebo/gazebo/setup.tcsh
pkg/trunk/stacks/simulator_gazebo/gazebo_worlds/launch/checker.launch
pkg/trunk/stacks/simulator_gazebo/gazebo_worlds/launch/light.launch
pkg/trunk/stacks/simulator_gazebo/gazebo_worlds/manifest.xml
pkg/trunk/stacks/trex/trex_pr2/cfg/launch_gazebo.xml
pkg/trunk/stacks/trex/trex_pr2/cfg/launch_gazebo_obstacle.xml
Added Paths:
-----------
pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/
pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/
pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/
pkg/trunk/stacks/pr2_simulator/pr2_gazebo/
pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/
pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/include/pr2_gazebo_plugins/
pkg/trunk/stacks/pr2_simulator/test_pr2_2dnav_gazebo/
pkg/trunk/stacks/pr2_simulator/test_pr2_gazebo_plugins/
pkg/trunk/stacks/simulator_gazebo/gazebo_worlds/
pkg/trunk/stacks/simulator_gazebo/ikea_objects/
pkg/trunk/stacks/simulator_gazebo/ikea_ogre/
Removed Paths:
-------------
pkg/trunk/demos/2dnav_gazebo/
pkg/trunk/demos/arm_gazebo/
pkg/trunk/demos/examples_gazebo/
pkg/trunk/demos/pr2_gazebo/
pkg/trunk/demos/test_2dnav_gazebo/
pkg/trunk/stacks/pr2_simulator/gazebo_plugin/
pkg/trunk/stacks/pr2_simulator/gazebo_worlds/
pkg/trunk/stacks/pr2_simulator/ikea_objects/
pkg/trunk/stacks/pr2_simulator/ikea_ogre/
pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/include/gazebo_plugin/
pkg/trunk/stacks/pr2_simulator/test_gazebo_plugin/
Modified: pkg/trunk/demos/door_demos_gazebo/launch/open_door_test.launch
===================================================================
--- pkg/trunk/demos/door_demos_gazebo/launch/open_door_test.launch 2009-09-03 03:44:00 UTC (rev 23748)
+++ pkg/trunk/demos/door_demos_gazebo/launch/open_door_test.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -4,7 +4,7 @@
<include file="$(find milestone2_actions)/milestone2.launch" />
<!-- assign localization for amcl -->
- <node pkg="test_2dnav_gazebo" type="set_goal.py" args="-amcl 14.75 22.125 -3.142 -x 14.75 -y 22.125 -t -3.142" output="screen" />
+ <node pkg="test_pr2_2dnav_gazebo" type="set_goal.py" args="-amcl 14.75 22.125 -3.142 -x 14.75 -y 22.125 -t -3.142" output="screen" />
<!-- visualization
<include file="$(find 2dnav_pr2)/rviz/rviz_move_base.launch" />
Modified: pkg/trunk/demos/erratic_gazebo/erratic_demo.launch
===================================================================
--- pkg/trunk/demos/erratic_gazebo/erratic_demo.launch 2009-09-03 03:44:00 UTC (rev 23748)
+++ pkg/trunk/demos/erratic_gazebo/erratic_demo.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -19,7 +19,7 @@
<node pkg="gazebo_tools" type="urdf2factory" args="robot_description" respawn="false" output="screen" />
<!-- load controllers -->
- <node pkg="gazebo_plugin" type="ros_diffdrive" respawn="true" output="screen"/>
+ <node pkg="pr2_gazebo_plugins" type="ros_diffdrive" respawn="true" output="screen"/>
</launch>
Modified: pkg/trunk/demos/erratic_gazebo/manifest.xml
===================================================================
--- pkg/trunk/demos/erratic_gazebo/manifest.xml 2009-09-03 03:44:00 UTC (rev 23748)
+++ pkg/trunk/demos/erratic_gazebo/manifest.xml 2009-09-03 04:26:27 UTC (rev 23749)
@@ -4,7 +4,7 @@
<license>BSD</license>
<review status="na" notes=""/>
<url>http://pr.willowgarage.com/wiki/Simulator</url>
- <depend package="gazebo_plugin"/>
+ <depend package="pr2_gazebo_plugins"/>
<depend package="gazebo_worlds"/>
<depend package="erratic_defs"/>
<depend package="robot_mechanism_controllers"/>
Modified: pkg/trunk/robot_descriptions/pr2/pr2_experimental_controllers/constraint_controllers/demo_constraint.launch
===================================================================
--- pkg/trunk/robot_descriptions/pr2/pr2_experimental_controllers/constraint_controllers/demo_constraint.launch 2009-09-03 03:44:00 UTC (rev 23748)
+++ pkg/trunk/robot_descriptions/pr2/pr2_experimental_controllers/constraint_controllers/demo_constraint.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -1,7 +1,7 @@
<launch>
<group name="wg">
- <node pkg="pr2_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 pr2_arm_gazebo)/r_arm_constraint_controller.xml" respawn="false" />
</group>
Modified: pkg/trunk/sandbox/dynamics_estimation/r_arm.launch
===================================================================
--- pkg/trunk/sandbox/dynamics_estimation/r_arm.launch 2009-09-03 03:44:00 UTC (rev 23748)
+++ pkg/trunk/sandbox/dynamics_estimation/r_arm.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -8,7 +8,7 @@
<include file="$(find pr2_defs)/launch/upload_r_arm.launch" />
<!-- push robot_description to factory and spawn robot in gazebo -->
- <node pkg="gazebo_plugin" type="urdf2factory" args="robot_description" respawn="false" output="screen"/>
+ <node pkg="gazebo_tools" type="urdf2factory" args="robot_description" respawn="false" output="screen"/>
<!-- Robot state publisher -->
<node pkg="robot_state_publisher" type="state_publisher" name="robot_state_publisher" output="screen">
@@ -19,7 +19,7 @@
<!-- start arm controller -->
<!--
- <node pkg="pr2_mechanism_control" type="spawner.py" args="$(find arm_gazebo)/l_arm_default_controller.xml" respawn="false" />
+ <node pkg="pr2_mechanism_control" type="spawner.py" args="$(find pr2_arm_gazebo)/l_arm_default_controller.xml" respawn="false" />
-->
<!-- send arm a command -->
@@ -30,7 +30,7 @@
<!-- for visualization -->
<!--
<node pkg="rviz" type="rviz" respawn="false" output="screen" />
- <include file="$(find arm_gazebo)/debug_plot.launch"/>
+ <include file="$(find pr2_arm_gazebo)/debug_plot.launch"/>
-->
</launch>
Modified: pkg/trunk/sandbox/teleop_anti_collision/launch/test_teleop_anti_collision.xml
===================================================================
--- pkg/trunk/sandbox/teleop_anti_collision/launch/test_teleop_anti_collision.xml 2009-09-03 03:44:00 UTC (rev 23748)
+++ pkg/trunk/sandbox/teleop_anti_collision/launch/test_teleop_anti_collision.xml 2009-09-03 04:26:27 UTC (rev 23749)
@@ -17,7 +17,7 @@
<!--node pkg="slam_gmapping" type="slam_gmapping" respawn="false" /-->
<!-- nav-stack -->
- <include file="$(find 2dnav_gazebo)/2dnav-stack-fake_localization.launch"/>
+ <include file="$(find pr2_2dnav_gazebo)/2dnav-stack-fake_localization.launch"/>
<!-- for visualization -->
<!--include file="$(find 2dnav_pr2)/rviz/rviz_move_base.launch"/-->
Modified: pkg/trunk/sandbox/webteleop/launch/gazebo.launch
===================================================================
--- pkg/trunk/sandbox/webteleop/launch/gazebo.launch 2009-09-03 03:44:00 UTC (rev 23748)
+++ pkg/trunk/sandbox/webteleop/launch/gazebo.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -1,6 +1,6 @@
<launch>
- <!--<include file="$(find 2dnav_gazebo)/pr2-wg-amcl.launch"/>-->
+ <!--<include file="$(find pr2_2dnav_gazebo)/pr2-wg-amcl.launch"/>-->
<!--<param name="/use_sim_time" value="true"/>-->
@@ -18,7 +18,7 @@
<node pkg="pr2_experimental_controllers" type="tuckarm.py" args="r" output="screen" />
<!-- nav-stack -->
- <include file="$(find 2dnav_gazebo)/2dnav-stack-amcl.launch"/>
+ <include file="$(find pr2_2dnav_gazebo)/2dnav-stack-amcl.launch"/>
<node pkg="image_publisher" type="encoder">
<remap from="image" to="/stereo/left_image"/>
Modified: pkg/trunk/stacks/pr2/pr2_alpha/prf_sim.launch
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/prf_sim.launch 2009-09-03 03:44:00 UTC (rev 23748)
+++ pkg/trunk/stacks/pr2/pr2_alpha/prf_sim.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -8,7 +8,7 @@
<!-- start Gazebo -->
<include file="$(find gazebo)/launch/empty_world.launch" />
<include file="$(find pr2_defs)/launch/upload_prf.launch" />
- <node pkg="gazebo_plugin" type="urdf2factory" args="robot_description" respawn="false" output="screen" />
+ <node pkg="gazebo_tools" type="urdf2factory" args="robot_description" respawn="false" output="screen" />
<!-- Joystick -->
@@ -28,22 +28,22 @@
<!-- battery plugin in gazebo -->
<!-- Base Laser -->
- <!-- as gazebo_plugin -->
+ <!-- as pr2_gazebo_plugins -->
<!-- Tilt Laser -->
- <!-- as gazebo_plugin -->
+ <!-- as pr2_gazebo_plugins -->
<!-- imu -->
- <!-- as gazebo_plugin -->
+ <!-- as pr2_gazebo_plugins -->
<!-- Videre Stereo cam -->
- <!-- as gazebo_plugin -->
+ <!-- as pr2_gazebo_plugins -->
<!-- Prosilica camera setup -->
- <!-- as gazebo_plugin -->
+ <!-- as pr2_gazebo_plugins -->
<!-- Forearm Camera -->
- <!-- can be loaded as gazebo_plugin, if you want this, add the map/verbatim blocks in urdf -->
+ <!-- can be loaded as pr2_gazebo_plugins, if you want this, add the map/verbatim blocks in urdf -->
<!-- Sound -->
<!-- n/a in gazebo -->
Property changes on: pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/demos/2dnav_gazebo:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Modified: pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/2dnav-stack-fake_localization.launch
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/2dnav-stack-fake_localization.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/2dnav-stack-fake_localization.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -2,7 +2,7 @@
<!-- machine tags for sim, be sure to set environment variable ROBOT to sim -->
<!--include file="$(find pr2_alpha)/$(env ROBOT).machine" /--> <!-- can't set env for include tags -->
<include file="$(find pr2_alpha)/sim.machine" />
- <include file="$(find 2dnav_gazebo)/config/fake_localization.launch" />
+ <include file="$(find pr2_2dnav_gazebo)/config/fake_localization.launch" />
<include file="$(find 2dnav_pr2)/config/base_odom_teleop.xml" />
<include file="$(find 2dnav_pr2)/config/lasers_and_filters.xml" />
<!--include file="$(find 2dnav_pr2)/config/map_server.launch" /-->
Modified: pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/config/tuck_arms.launch
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/config/tuck_arms.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/config/tuck_arms.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -1,6 +1,6 @@
<launch>
<!-- Tug Arms For Navigation -->
- <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_mechanism_control" type="spawner.py" args="$(find pr2_arm_gazebo)/l_arm_default_controller.xml" output="screen" machine="four" />
+ <node pkg="pr2_mechanism_control" type="spawner.py" args="$(find pr2_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/stacks/pr2_simulator/pr2_2dnav_gazebo/doc.dox
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/doc.dox 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/doc.dox 2009-09-03 04:26:27 UTC (rev 23749)
@@ -18,7 +18,7 @@
<!-- load map -->
<node pkg="map_server" type="map_server" args="$(find gazebo_worlds)/Media/materials/textures/map_blank.png 0.1" respawn="true" machine="three" />
<!-- nav-stack -->
- <include file="$(find 2dnav_gazebo)/2dnav-stack-amcl.launch"/>
+ <include file="$(find pr2_2dnav_gazebo)/2dnav-stack-amcl.launch"/>
<!-- for visualization -->
<include file="$(find 2dnav_pr2)/rviz/rviz_move_base.launch"/>
<!-- for manual control -->
Modified: pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/manifest.xml
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/manifest.xml 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/manifest.xml 2009-09-03 04:26:27 UTC (rev 23749)
@@ -12,7 +12,7 @@
<depend package="amcl"/>
<depend package="fake_localization"/>
<depend package="pr2_gazebo"/>
- <depend package="gazebo_plugin"/>
+ <depend package="pr2_gazebo_plugins"/>
<depend package="gazebo_tools"/>
<depend package="rviz"/>
<depend package="teleop_base"/>
Modified: pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/pr2-empty-amcl.launch
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/pr2-empty-amcl.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/pr2-empty-amcl.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -13,7 +13,7 @@
<node pkg="map_server" type="map_server" args="$(find gazebo_worlds)/Media/materials/textures/map_blank.png 0.1" respawn="true" machine="three" />
<!-- nav-stack -->
- <include file="$(find 2dnav_gazebo)/2dnav-stack-amcl.launch"/>
+ <include file="$(find pr2_2dnav_gazebo)/2dnav-stack-amcl.launch"/>
<!-- for visualization -->
<include file="$(find 2dnav_pr2)/rviz/rviz_move_base.launch"/>
Modified: pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/pr2-empty-fake_localization.launch
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/pr2-empty-fake_localization.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/pr2-empty-fake_localization.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -13,7 +13,7 @@
<node pkg="map_server" type="map_server" args="$(find gazebo_worlds)/Media/materials/textures/map_blank.png 0.1" respawn="true" machine="three" />
<!-- nav-stack -->
- <include file="$(find 2dnav_gazebo)/2dnav-stack-fake_localization.launch"/>
+ <include file="$(find pr2_2dnav_gazebo)/2dnav-stack-fake_localization.launch"/>
<!-- for visualization -->
<!--
Modified: pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/pr2-simple-fake_localization.launch
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/pr2-simple-fake_localization.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/pr2-simple-fake_localization.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -13,7 +13,7 @@
<node pkg="map_server" type="map_server" args="$(find gazebo_worlds)/Media/materials/textures/map3.png 0.1" respawn="true" machine="three" />
<!-- nav-stack -->
- <include file="$(find 2dnav_gazebo)/2dnav-stack-fake_localization.launch"/>
+ <include file="$(find pr2_2dnav_gazebo)/2dnav-stack-fake_localization.launch"/>
<!-- for visualization -->
<!--
Modified: pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/pr2-wg-amcl.launch
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/pr2-wg-amcl.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/pr2-wg-amcl.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -13,7 +13,7 @@
<node pkg="pr2_experimental_controllers" type="tuckarm.py" args="b" output="screen" />
<!-- nav-stack -->
- <include file="$(find 2dnav_gazebo)/2dnav-stack-amcl.launch"/>
+ <include file="$(find pr2_2dnav_gazebo)/2dnav-stack-amcl.launch"/>
<!-- for visualization -->
<!--
Modified: pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/prototype1-simple-amcl.launch
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/prototype1-simple-amcl.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/prototype1-simple-amcl.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -10,7 +10,7 @@
<node pkg="map_server" type="map_server" args="$(find gazebo_worlds)/Media/materials/textures/map3.png 0.1" respawn="true" machine="three" />
<!-- nav-stack -->
- <include file="$(find 2dnav_gazebo)/2dnav-stack-amcl.launch"/>
+ <include file="$(find pr2_2dnav_gazebo)/2dnav-stack-amcl.launch"/>
<!-- for visualization -->
<!--
Modified: pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/prototype1-wg-fake_localization.launch
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/prototype1-wg-fake_localization.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/prototype1-wg-fake_localization.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -10,7 +10,7 @@
<node pkg="map_server" type="map_server" args="$(find gazebo_worlds)/Media/materials/textures/willowMap.png 0.1" respawn="true" machine="three" />
<!-- nav-stack -->
- <include file="$(find 2dnav_gazebo)/2dnav-stack-fake_localization.launch"/>
+ <include file="$(find pr2_2dnav_gazebo)/2dnav-stack-fake_localization.launch"/>
<!-- for visualization -->
<!--
Modified: pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/trex/run_milestone_1_gazebo.xml
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo.xml 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/trex/run_milestone_1_gazebo.xml 2009-09-03 04:26:27 UTC (rev 23749)
@@ -1,10 +1,10 @@
<launch>
<!-- start up robot with 2dnav-stack -->
- <include file="$(find 2dnav_gazebo)/2dnav-gazebo-prototype1-wg-fake_localization.xml"/>
+ <include file="$(find pr2_2dnav_gazebo)/2dnav-gazebo-prototype1-wg-fake_localization.xml"/>
<!-- start up trex -->
<param name="/trex/input_file" value="pr2.cfg"/>
- <param name="/trex/path" value="$(find 2dnav_gazebo)/trex:$(find trex_ros)/miles_gazebo.3:$(find 2dnav_gazebo)/trex/logs:$(find trex_ros)"/>
- <param name="/trex/log_dir" value="$(find 2dnav_gazebo)/trex/logs"/>
+ <param name="/trex/path" value="$(find pr2_2dnav_gazebo)/trex:$(find trex_ros)/miles_gazebo.3:$(find pr2_2dnav_gazebo)/trex/logs:$(find trex_ros)"/>
+ <param name="/trex/log_dir" value="$(find pr2_2dnav_gazebo)/trex/logs"/>
<node pkg="trex_pr2" type="trexfast" output="screen" />
</launch>
Modified: pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/trex/run_milestone_1_gazebo_empty.xml
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo_empty.xml 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_2dnav_gazebo/trex/run_milestone_1_gazebo_empty.xml 2009-09-03 04:26:27 UTC (rev 23749)
@@ -1,10 +1,10 @@
<launch>
<!-- start up robot with 2dnav-stack -->
- <include file="$(find 2dnav_gazebo)/2dnav-gazebo-empty-fake_localization.xml"/>
+ <include file="$(find pr2_2dnav_gazebo)/2dnav-gazebo-empty-fake_localization.xml"/>
<!-- start up trex -->
<param name="/trex/input_file" value="pr2.cfg"/>
- <param name="/trex/path" value="$(find 2dnav_gazebo)/trex:$(find trex_ros)/miles_gazebo.3:$(find 2dnav_gazebo)/trex/logs:$(find trex_ros)"/>
- <param name="/trex/log_dir" value="$(find 2dnav_gazebo)/trex/logs"/>
+ <param name="/trex/path" value="$(find pr2_2dnav_gazebo)/trex:$(find trex_ros)/miles_gazebo.3:$(find pr2_2dnav_gazebo)/trex/logs:$(find trex_ros)"/>
+ <param name="/trex/log_dir" value="$(find pr2_2dnav_gazebo)/trex/logs"/>
<node pkg="trex_pr2" type="trexfast" output="screen" />
</launch>
Property changes on: pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/demos/arm_gazebo:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Modified: pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/l_arm.launch
===================================================================
--- pkg/trunk/demos/arm_gazebo/l_arm.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/l_arm.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -9,7 +9,7 @@
<!-- for visualization -->
<!--
<node pkg="rviz" type="rviz" respawn="false" output="screen" />
- <include file="$(find arm_gazebo)/tests/debug_plot.launch"/>
+ <include file="$(find pr2_arm_gazebo)/tests/debug_plot.launch"/>
-->
<!-- Robot state publisher -->
Modified: pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/l_gripper.launch
===================================================================
--- pkg/trunk/demos/arm_gazebo/l_gripper.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/l_gripper.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -9,7 +9,7 @@
<!-- for visualization -->
<!--
<node pkg="rviz" type="rviz" respawn="false" output="screen" />
- <include file="$(find arm_gazebo)/debug_plot.launch"/>
+ <include file="$(find pr2_arm_gazebo)/debug_plot.launch"/>
-->
<!-- Robot state publisher -->
Modified: pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/manifest.xml
===================================================================
--- pkg/trunk/demos/arm_gazebo/manifest.xml 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/manifest.xml 2009-09-03 04:26:27 UTC (rev 23749)
@@ -4,7 +4,7 @@
<license>BSD</license>
<review status="na" notes=""/>
<url>http://pr.willowgarage.com/wiki/Simulator</url>
- <depend package="gazebo_plugin"/>
+ <depend package="pr2_gazebo_plugins"/>
<depend package="gazebo_tools"/>
<depend package="teleop_arm_keyboard"/>
<depend package="rviz"/>
Modified: pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/r_arm.launch
===================================================================
--- pkg/trunk/demos/arm_gazebo/r_arm.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/r_arm.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -10,7 +10,7 @@
<!-- for visualization -->
<!--
<node pkg="rviz" type="rviz" respawn="false" output="screen" />
- <include file="$(find arm_gazebo)/tests/debug_plot.launch"/>
+ <include file="$(find pr2_arm_gazebo)/tests/debug_plot.launch"/>
-->
<!-- Robot state publisher -->
Modified: pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/r_arm_grasping_demo.launch
===================================================================
--- pkg/trunk/demos/arm_gazebo/r_arm_grasping_demo.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/r_arm_grasping_demo.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -15,20 +15,20 @@
<node pkg="gazebo_tools" type="urdf2factory" args="robot_description_new" respawn="false" output="screen"/>
<!-- start arm controller -->
- <include file="$(find arm_gazebo)/controllers/r_arm_position_controller.launch"/>
+ <include file="$(find pr2_arm_gazebo)/controllers/r_arm_position_controller.launch"/>
<!-- some hand waving -->
- <node pkg="arm_gazebo" type="grasp_preprogrammed.py" output="screen"/>
+ <node pkg="pr2_arm_gazebo" type="grasp_preprogrammed.py" output="screen"/>
<!-- for visualization -->
<!--
<node pkg="rviz" type="rviz" respawn="false" output="screen" />
-->
- <!--include file="$(find arm_gazebo)/tests/debug_plot.launch"/-->
+ <!--include file="$(find pr2_arm_gazebo)/tests/debug_plot.launch"/-->
- <param name="table_description" command="$(find xacro)/xacro.py '$(find examples_gazebo)/table_defs/table_defs.xml'" />
+ <param name="table_description" command="$(find xacro)/xacro.py '$(find pr2_examples_gazebo)/table_defs/table_defs.xml'" />
<node pkg="gazebo_tools" type="urdf2factory" args="table_description 0 0 0.01 0 0 0 table_model" respawn="false" output="screen" />
- <include file="$(find examples_gazebo)/coffee_cup.launch" />
+ <include file="$(find pr2_examples_gazebo)/coffee_cup.launch" />
</launch>
Modified: pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/r_gripper.launch
===================================================================
--- pkg/trunk/demos/arm_gazebo/r_gripper.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/r_gripper.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -9,7 +9,7 @@
<!-- for visualization -->
<!--
<node pkg="rviz" type="rviz" respawn="false" output="screen" />
- <include file="$(find arm_gazebo)/debug_plot.launch"/>
+ <include file="$(find pr2_arm_gazebo)/debug_plot.launch"/>
-->
<!-- Robot state publisher -->
Modified: pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/scripts/grasp_preprogrammed.py
===================================================================
--- pkg/trunk/demos/arm_gazebo/scripts/grasp_preprogrammed.py 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/scripts/grasp_preprogrammed.py 2009-09-03 04:26:27 UTC (rev 23749)
@@ -34,7 +34,7 @@
## Gazebo tug arms for navigation
-PKG = 'arm_gazebo'
+PKG = 'pr2_arm_gazebo'
NAME = 'grasp_preprogrammed'
import math
Modified: pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/scripts/l_arm_max.py
===================================================================
--- pkg/trunk/demos/arm_gazebo/scripts/l_arm_max.py 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/scripts/l_arm_max.py 2009-09-03 04:26:27 UTC (rev 23749)
@@ -34,7 +34,7 @@
## Gazebo tug arms for navigation
-PKG = 'arm_gazebo'
+PKG = 'pr2_arm_gazebo'
NAME = 'l_arm_setting'
import math
Modified: pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/scripts/l_arm_min.py
===================================================================
--- pkg/trunk/demos/arm_gazebo/scripts/l_arm_min.py 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/scripts/l_arm_min.py 2009-09-03 04:26:27 UTC (rev 23749)
@@ -34,7 +34,7 @@
## Gazebo tug arms for navigation
-PKG = 'arm_gazebo'
+PKG = 'pr2_arm_gazebo'
NAME = 'l_arm_setting'
import math
Modified: pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/scripts/l_arm_test.py
===================================================================
--- pkg/trunk/demos/arm_gazebo/scripts/l_arm_test.py 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/scripts/l_arm_test.py 2009-09-03 04:26:27 UTC (rev 23749)
@@ -36,7 +36,7 @@
## Limits were taken originally from pr2_defs/defs/arm_defs.xml, double check for changes.
## Works with l_arm_test_controller.xml controllers
-PKG = 'arm_gazebo'
+PKG = 'pr2_arm_gazebo'
NAME = 'l_arm_setting'
import math
Modified: pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/scripts/l_arm_test_random.py
===================================================================
--- pkg/trunk/demos/arm_gazebo/scripts/l_arm_test_random.py 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/scripts/l_arm_test_random.py 2009-09-03 04:26:27 UTC (rev 23749)
@@ -34,7 +34,7 @@
## Gazebo tug arms for navigation
-PKG = 'arm_gazebo'
+PKG = 'pr2_arm_gazebo'
NAME = 'l_arm_setting'
import math
Modified: pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/scripts/test_launch_order.tcsh
===================================================================
--- pkg/trunk/demos/arm_gazebo/scripts/test_launch_order.tcsh 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/scripts/test_launch_order.tcsh 2009-09-03 04:26:27 UTC (rev 23749)
@@ -7,7 +7,7 @@
echo "----------------starting gazebo"
source `rospack find gazebo`/setup.tcsh
-gazebo `rospack find gazebo_worlds`/gazebo_worlds/empty.world &
+gazebo `rospack find gazebo_worlds`/worlds/empty.world &
sleep 5
@@ -20,7 +20,7 @@
`rospack find gazebo_tools`/urdf2factory "robot_description"
echo "----------------spawn controller"
-`rospack find mechanism_control`/scripts/mech.py sp `rospack find arm_gazebo`/r_arm_default_controller.xml
+`rospack find mechanism_control`/scripts/mech.py sp `rospack find pr2_arm_gazebo`/r_arm_default_controller.xml
echo "----------------set gripper gap"
`rospack find robot_mechanism_controllers`/scripts/control.py set r_gripper_controller 0.0
Modified: pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/tests/r_arm_constraint.launch
===================================================================
--- pkg/trunk/demos/arm_gazebo/tests/r_arm_constraint.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/tests/r_arm_constraint.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -23,7 +23,7 @@
<!-- start arm controller -->
<!--
- <node pkg="pr2_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 pr2_arm_gazebo)/r_arm_constraint_controller.xml" respawn="false" />
-->
Modified: pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/tests/r_arm_spacenav.launch
===================================================================
--- pkg/trunk/demos/arm_gazebo/tests/r_arm_spacenav.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_arm_gazebo/tests/r_arm_spacenav.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -14,11 +14,11 @@
<node pkg="gazebo_tools" type="urdf2factory" args="robot_description" respawn="false" output="screen"/>
<!-- start arm controller -->
- <!-- tried to revive, copied into arm_gazebo from arm_life_test, but controller breaks. -->
- <include file="$(find arm_gazebo)/teleop_arm.launch"/>
+ <!-- tried to revive, copied into pr2_arm_gazebo from arm_life_test, but controller breaks. -->
+ <include file="$(find pr2_arm_gazebo)/teleop_arm.launch"/>
<node pkg="spacenav_node" type="spacenav_node" args="" respawn="false" output="screen" />
- <param name="table_description" command="$(find xacro)/xacro.py '$(find examples_gazebo)/table_defs/table_defs.xml'" />
+ <param name="table_description" command="$(find xacro)/xacro.py '$(find pr2_examples_gazebo)/table_defs/table_defs.xml'" />
<node pkg="gazebo_tools" type="urdf2factory" args="table_description" respawn="false" output="screen" />
</launch>
Property changes on: pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/demos/examples_gazebo:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Modified: pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/dual_link.launch
===================================================================
--- pkg/trunk/demos/examples_gazebo/dual_link.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/dual_link.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -1,11 +1,11 @@
<launch>
<!-- send dual_link.xml to param server -->
- <param name="robot_description_new" command="$(find xacro)/xacro.py '$(find examples_gazebo)/dual_link_defs/dual_link.xml'" />
+ <param name="robot_description_new" command="$(find xacro)/xacro.py '$(find pr2_examples_gazebo)/dual_link_defs/dual_link.xml'" />
<!-- push robot_description to factory and spawn robot in gazebo -->
<node pkg="gazebo_tools" type="urdf2factory" args="robot_description_new" respawn="false" output="screen" />
- <!--node pkg="pr2_mechanism_control" type="mech.py" args="sp $(find examples_gazebo)/dual_link_defs/controllers_dual_link.xml" respawn="false" output="screen" /-->
+ <!--node pkg="pr2_mechanism_control" type="mech.py" args="sp $(find pr2_examples_gazebo)/dual_link_defs/controllers_dual_link.xml" respawn="false" output="screen" /-->
<!--node pkg="robot_mechanism_controllers" type="control.py" args="set test_controller 0.5" respawn="false" output="screen" /--> <!-- open gripper .5 radians -->
</launch>
Modified: pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/dual_link_defs/Makefile
===================================================================
--- pkg/trunk/demos/examples_gazebo/dual_link_defs/Makefile 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/dual_link_defs/Makefile 2009-09-03 04:26:27 UTC (rev 23749)
@@ -1,6 +1,6 @@
XACRO = `rospack find xacro`/xacro.py
URDF2GAZEBO = `rospack find gazebo_tools`/bin/urdf2file
-MODEL_FILE = `rospack find examples_gazebo`
+MODEL_FILE = `rospack find pr2_examples_gazebo`
ROBOT = dual_link
Modified: pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/dual_link_defs/send_description.launch
===================================================================
--- pkg/trunk/demos/examples_gazebo/dual_link_defs/send_description.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/dual_link_defs/send_description.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -1,5 +1,5 @@
<launch>
- <param name="robot_description" command="$(find xacro)/xacro.py '$(find examples_gazebo)/dual_link_defs/dual_link.xml'" />
+ <param name="robot_description" command="$(find xacro)/xacro.py '$(find pr2_examples_gazebo)/dual_link_defs/dual_link.xml'" />
</launch>
Modified: pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/manifest.xml
===================================================================
--- pkg/trunk/demos/examples_gazebo/manifest.xml 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/manifest.xml 2009-09-03 04:26:27 UTC (rev 23749)
@@ -4,7 +4,7 @@
<license>BSD</license>
<review status="na" notes=""/>
<url>http://pr.willowgarage.com/wiki/Simulator</url>
- <depend package="gazebo_plugin"/>
+ <depend package="pr2_gazebo_plugins"/>
<depend package="gazebo_tools"/>
<depend package="teleop_arm_keyboard"/>
</package>
Modified: pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/multi_link.launch
===================================================================
--- pkg/trunk/demos/examples_gazebo/multi_link.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/multi_link.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -1,11 +1,11 @@
<launch>
<!-- send multi_link.xml to param server -->
- <param name="robot_description" command="$(find xacro)/xacro.py '$(find examples_gazebo)/multi_link_defs/multi_link.xml'" />
+ <param name="robot_description" command="$(find xacro)/xacro.py '$(find pr2_examples_gazebo)/multi_link_defs/multi_link.xml'" />
<!-- push robot_description to factory and spawn robot in gazebo -->
<node pkg="gazebo_tools" type="urdf2factory" args="robot_description" respawn="false" output="screen" />
- <node pkg="pr2_mechanism_control" type="mech.py" args="sp $(find examples_gazebo)/multi_link_defs/controllers_multi_link_zero_gains.xml" respawn="false" output="screen" />
+ <node pkg="pr2_mechanism_control" type="mech.py" args="sp $(find pr2_examples_gazebo)/multi_link_defs/controllers_multi_link_zero_gains.xml" respawn="false" output="screen" />
<!--node pkg="robot_mechanism_controllers" type="control.py" args="set test_controller 0.5" respawn="false" output="screen" /--> <!-- open gripper .5 radians -->
</launch>
Modified: pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/multi_link_defs/Makefile
===================================================================
--- pkg/trunk/demos/examples_gazebo/multi_link_defs/Makefile 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/multi_link_defs/Makefile 2009-09-03 04:26:27 UTC (rev 23749)
@@ -1,6 +1,6 @@
XACRO = `rospack find xacro`/xacro.py
URDF2GAZEBO = `rospack find gazebo_tools`/bin/urdf2file
-MODEL_FILE = `rospack find examples_gazebo`
+MODEL_FILE = `rospack find pr2_examples_gazebo`
ROBOT = multi_link
Modified: pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/multi_link_defs/send_description.launch
===================================================================
--- pkg/trunk/demos/examples_gazebo/multi_link_defs/send_description.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/multi_link_defs/send_description.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -1,5 +1,5 @@
<launch>
- <param name="robot_description" command="$(find xacro)/xacro.py '$(find examples_gazebo)/multi_link_defs/multi_link.xml'" />
+ <param name="robot_description" command="$(find xacro)/xacro.py '$(find pr2_examples_gazebo)/multi_link_defs/multi_link.xml'" />
</launch>
Modified: pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/simple_box.launch
===================================================================
--- pkg/trunk/demos/examples_gazebo/simple_box.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/simple_box.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -1,6 +1,6 @@
<launch>
<!-- send simple_box.xml to param server -->
- <param name="simple_box" command="$(find xacro)/xacro.py '$(find examples_gazebo)/simple_rdf_examples/simple_box.xml'" />
+ <param name="simple_box" command="$(find xacro)/xacro.py '$(find pr2_examples_gazebo)/simple_rdf_examples/simple_box.xml'" />
<node pkg="gazebo_tools" type="urdf2factory" args="simple_box" respawn="false" output="screen" />
</launch>
Modified: pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/simple_cylinder.launch
===================================================================
--- pkg/trunk/demos/examples_gazebo/simple_cylinder.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/simple_cylinder.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -1,6 +1,6 @@
<launch>
<!-- send simple_cylinder.xml to param server -->
- <param name="simple_cylinder" command="$(find xacro)/xacro.py '$(find examples_gazebo)/simple_rdf_examples/simple_cylinder.xml'" />
+ <param name="simple_cylinder" command="$(find xacro)/xacro.py '$(find pr2_examples_gazebo)/simple_rdf_examples/simple_cylinder.xml'" />
<node pkg="gazebo_tools" type="urdf2factory" args="simple_cylinder" respawn="false" output="screen" />
</launch>
Modified: pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/simple_sphere.launch
===================================================================
--- pkg/trunk/demos/examples_gazebo/simple_sphere.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/simple_sphere.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -1,6 +1,6 @@
<launch>
<!-- send simple_sphere.xml to param server -->
- <param name="simple_sphere" command="$(find xacro)/xacro.py '$(find examples_gazebo)/simple_rdf_examples/simple_sphere.xml'" />
+ <param name="simple_sphere" command="$(find xacro)/xacro.py '$(find pr2_examples_gazebo)/simple_rdf_examples/simple_sphere.xml'" />
<node pkg="gazebo_tools" type="urdf2factory" args="simple_sphere" respawn="false" output="screen" />
</launch>
Modified: pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/single_link.launch
===================================================================
--- pkg/trunk/demos/examples_gazebo/single_link.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/single_link.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -1,11 +1,11 @@
<launch>
<!-- send single_link.xml to param server -->
- <param name="robot_description" command="$(find xacro)/xacro.py '$(find examples_gazebo)/single_link_defs/single_link.xml'" />
+ <param name="robot_description" command="$(find xacro)/xacro.py '$(find pr2_examples_gazebo)/single_link_defs/single_link.xml'" />
<!-- push robot_description to factory and spawn robot in gazebo -->
<node pkg="gazebo_tools" type="urdf2factory" args="robot_description" respawn="false" output="screen" />
- <node pkg="pr2_mechanism_control" type="spawner.py" args="$(find examples_gazebo)/single_link_defs/controllers_single_link.xml" respawn="false" output="screen" />
+ <node pkg="pr2_mechanism_control" type="spawner.py" args="$(find pr2_examples_gazebo)/single_link_defs/controllers_single_link.xml" respawn="false" output="screen" />
<node pkg="robot_mechanism_controllers" type="control.py" args="set test_controller 0.5" respawn="false" output="screen" />
</launch>
Modified: pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/single_link_defs/Makefile
===================================================================
--- pkg/trunk/demos/examples_gazebo/single_link_defs/Makefile 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/single_link_defs/Makefile 2009-09-03 04:26:27 UTC (rev 23749)
@@ -1,6 +1,6 @@
XACRO = `rospack find xacro`/xacro.py
URDF2GAZEBO = `rospack find gazebo_tools`/bin/urdf2file
-MODEL_FILE = `rospack find examples_gazebo`
+MODEL_FILE = `rospack find pr2_examples_gazebo`
ROBOT = single_link
Modified: pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/single_link_defs/send_description.launch
===================================================================
--- pkg/trunk/demos/examples_gazebo/single_link_defs/send_description.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/single_link_defs/send_description.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -1,5 +1,5 @@
<launch>
- <param name="robot_description" command="$(find xacro)/xacro.py '$(find examples_gazebo)/single_link_defs/single_link.xml'" />
+ <param name="robot_description" command="$(find xacro)/xacro.py '$(find pr2_examples_gazebo)/single_link_defs/single_link.xml'" />
</launch>
Modified: pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/table.launch
===================================================================
--- pkg/trunk/demos/examples_gazebo/table.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/table.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -1,6 +1,6 @@
<launch>
<!-- send table.xml to param server -->
- <param name="table_description" command="$(find xacro)/xacro.py '$(find examples_gazebo)/table_defs/table.xml'" />
+ <param name="table_description" command="$(find xacro)/xacro.py '$(find pr2_examples_gazebo)/table_defs/table.xml'" />
<!-- push table_description to factory and spawn robot in gazebo -->
<node pkg="gazebo_tools" type="urdf2factory" args="table_description" respawn="false" output="screen" /> <!-- load default arm controller -->
Modified: pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/table_defs/Makefile
===================================================================
--- pkg/trunk/demos/examples_gazebo/table_defs/Makefile 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/table_defs/Makefile 2009-09-03 04:26:27 UTC (rev 23749)
@@ -1,6 +1,6 @@
XACRO = `rospack find xacro`/xacro.py
URDF2GAZEBO = `rospack find gazebo_tools`/bin/urdf2file
-MODEL_FILE = `rospack find examples_gazebo`
+MODEL_FILE = `rospack find pr2_examples_gazebo`
ROBOT = table
Modified: pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/table_defs/table.xml
===================================================================
--- pkg/trunk/demos/examples_gazebo/table_defs/table.xml 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_examples_gazebo/table_defs/table.xml 2009-09-03 04:26:27 UTC (rev 23749)
@@ -14,7 +14,7 @@
xmlns:physics="http://playerstage.sourceforge.net/gazebo/xmlschema/#physics">
- <include filename="$(find examples_gazebo)/table_defs/table_defs.xml" />
+ <include filename="$(find pr2_examples_gazebo)/table_defs/table_defs.xml" />
<map name="sensor" flag="gazebo">
<verbatim key="mechanism_control_simulation">
Property changes on: pkg/trunk/stacks/pr2_simulator/pr2_gazebo
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/demos/pr2_gazebo:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Modified: pkg/trunk/stacks/pr2_simulator/pr2_gazebo/manifest.xml
===================================================================
--- pkg/trunk/demos/pr2_gazebo/manifest.xml 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_gazebo/manifest.xml 2009-09-03 04:26:27 UTC (rev 23749)
@@ -4,7 +4,7 @@
<license>BSD</license>
<review status="na" notes=""/>
<url>http://pr.willowgarage.com/wiki/Simulator</url>
- <depend package="gazebo_plugin"/>
+ <depend package="pr2_gazebo_plugins"/>
<depend package="gazebo_tools"/>
<depend package="teleop_arm_keyboard"/>
<depend package="pr2_ogre" />
Modified: pkg/trunk/stacks/pr2_simulator/pr2_gazebo/map_building_demo.launch
===================================================================
--- pkg/trunk/demos/pr2_gazebo/map_building_demo.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_gazebo/map_building_demo.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -22,7 +22,7 @@
NOTE: not working with amcl in loop, need to fix how amcl updates dynamic map
NOTE: for now, rosrun teleop_base teleop_base_keyboard to drive robot around
-->
- <!--include file="$(find 2dnav_gazebo)/2dnav-stack-amcl.launch"/-->
+ <!--include file="$(find pr2_2dnav_gazebo)/2dnav-stack-amcl.launch"/-->
<!--node pkg="map_server" type="map_server" args="$(find gazebo_worlds)/Media/materials/textures/map_blank.png 0.1" respawn="true" /-->
</launch>
Modified: pkg/trunk/stacks/pr2_simulator/pr2_gazebo/pr2_default_controllers.launch
===================================================================
--- pkg/trunk/demos/pr2_gazebo/pr2_default_controllers.launch 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_gazebo/pr2_default_controllers.launch 2009-09-03 04:26:27 UTC (rev 23749)
@@ -4,8 +4,8 @@
<include file="$(find pr2_default_controllers)/pr2_base_controller_odom.launch"/>
<include file="$(find pr2_default_controllers)/head_position_controller.launch"/>
<include file="$(find pr2_gazebo)/controllers/pr2_tilt_laser_controller.launch"/>
- <include file="$(find arm_gazebo)/controllers/l_arm_position_controller.launch"/>
- <include file="$(find arm_gazebo)/controllers/r_arm_position_controller.launch"/>
+ <include file="$(find pr2_arm_gazebo)/controllers/l_arm_position_controller.launch"/>
+ <include file="$(find pr2_arm_gazebo)/controllers/r_arm_position_controller.launch"/>
<include file="$(find pr2_gazebo)/controllers/pr2_torso_controller.launch"/>
</launch>
Modified: pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/CMakeLists.txt
===================================================================
--- pkg/trunk/stacks/pr2_simulator/gazebo_plugin/CMakeLists.txt 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/CMakeLists.txt 2009-09-03 04:26:27 UTC (rev 23749)
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.4.6)
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
set(ROS_BUILD_TYPE Debug)
-rospack(gazebo_plugin)
+rospack(pr2_gazebo_plugins)
genmsg()
include_directories(msg/cpp)
gensrv()
Modified: pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/doc.dox
===================================================================
--- pkg/trunk/stacks/pr2_simulator/gazebo_plugin/doc.dox 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/doc.dox 2009-09-03 04:26:27 UTC (rev 23749)
@@ -12,10 +12,10 @@
@section usage PR2 Simulation Quick Start Guide
-\li If you have successfully \e rosmake \e 2dnav_gazebo, you have everything needed to run all PR2 2dnav-stack demos in 3D simulation. Otherwise, to compile a minimum set of packages for running Gazebo:
+\li If you have successfully \e rosmake \e pr2_2dnav_gazebo, you have everything needed to run all PR2 2dnav-stack demos in 3D simulation. Otherwise, to compile a minimum set of packages for running Gazebo:
@verbatim
$ rosmake gazebo
- $ rosmake gazebo_plugin
+ $ rosmake pr2_gazebo_plugins
$ rosmake gazebo_worlds
@endverbatim
@@ -42,7 +42,7 @@
For example, you can find the complete PR2 description file in \b ros-pkg/.../pr2_defs/robots/pr2.xacro.xml.
- To manually convert \b pr2.xacro.xml into Gazebo xml format run the following commands:
@verbatim
- $ rosmake gazebo_plugin
+ $ rosmake pr2_gazebo_plugins
$ rosmake pr2_defs
$ rosrun gazebo_tools urdf2file `rospack find pr2_defs`/robots/pr2.expanded.xml `rospack find pr2_defs`/robots/pr2.model
@endverbatim
Property changes on: pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/include/pr2_gazebo_plugins
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/drivers/simulator/gazebo_plugin/include/gazebo_plugin:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Modified: pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/include/pr2_gazebo_plugins/gazebo_battery.h
===================================================================
--- pkg/trunk/stacks/pr2_simulator/gazebo_plugin/include/gazebo_plugin/gazebo_battery.h 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/include/pr2_gazebo_plugins/gazebo_battery.h 2009-09-03 04:26:27 UTC (rev 23749)
@@ -38,7 +38,7 @@
#include <pr2_msgs/PowerState.h>
#include <diagnostic_msgs/DiagnosticArray.h>
#include <diagnostic_msgs/DiagnosticStatus.h>
-#include <gazebo_plugin/PlugCommand.h>
+#include <pr2_gazebo_plugins/PlugCommand.h>
#include <ros/ros.h>
#include <boost/thread/mutex.hpp>
@@ -159,7 +159,7 @@
private: double default_consumption_rate_;
/// \brief listen to ROS to see if we are charging
- private: void SetPlug(const gazebo_plugin::PlugCommandConstPtr& plug_msg);
+ private: void SetPlug(const pr2_gazebo_plugins::PlugCommandConstPtr& plug_msg);
};
Modified: pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/include/pr2_gazebo_plugins/gazebo_mechanism_control.h
===================================================================
--- pkg/trunk/stacks/pr2_simulator/gazebo_plugin/include/gazebo_plugin/gazebo_mechanism_control.h 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/include/pr2_gazebo_plugins/gazebo_mechanism_control.h 2009-09-03 04:26:27 UTC (rev 23749)
@@ -101,7 +101,7 @@
-# Controller reads \b joint-state and issues a \b joint-torque-command
.
- @image html "http://pr.willowgarage.com/wiki/gazebo_plugin?action=AttachFile&do=get&target=gazebo_mcn.jpg" "Gazebo Mechanism Control Model"
+ @image html "http://pr.willowgarage.com/wiki/pr2_gazebo_plugins?action=AttachFile&do=get&target=gazebo_mcn.jpg" "Gazebo Mechanism Control Model"
- Example Usage:
\verbatim
Modified: pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/manifest.xml
===================================================================
--- pkg/trunk/stacks/pr2_simulator/gazebo_plugin/manifest.xml 2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/stacks/pr2_simulator/pr2_gazebo_plugins/manifest.xml 2009-09-03 04:26:27 ...
[truncated message content] |
