diff --git a/CMakeLists.txt b/CMakeLists.txt
index 82bbba7..9bdb579 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,6 +47,7 @@ set (dirs
pioneer2dx
powerplant
pr2
+ pr2_gripper
saucepan
simple_arm
simple_arm_gripper
diff --git a/manifest.xml b/manifest.xml
index 81b6e62..24142bd 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -20,6 +20,7 @@
file://pioneer2dx
file://powerplant
file://pr2
+ file://pr2_gripper
file://saucepan
file://simple_arm
file://simple_arm_gripper
diff --git a/pr2/model.sdf b/pr2/model.sdf
index 8c91745..e1d5a81 100644
--- a/pr2/model.sdf
+++ b/pr2/model.sdf
@@ -550,7 +550,7 @@
0.959931
0.100000
10.000000
- 0.023200 0.110000 0.119100 3.141593 -1.570793 3.141593
+ 0.023200 0.110000 0.119100 0 -1.570793 0
0
diff --git a/pr2_gripper/manifest.xml b/pr2_gripper/manifest.xml
new file mode 100644
index 0000000..1ca1c62
--- /dev/null
+++ b/pr2_gripper/manifest.xml
@@ -0,0 +1,23 @@
+
+
+
+ PR2 Gripper
+ 1.0
+ model.sdf
+
+
+ John Hsu
+ hsu@osrfoundation.org
+
+
+
+ The Willow Garage PR2 gripper model.
+
+
+
+
+ model://pr2
+ 1.0
+
+
+
diff --git a/pr2_gripper/model.sdf b/pr2_gripper/model.sdf
new file mode 100644
index 0000000..295f3e3
--- /dev/null
+++ b/pr2_gripper/model.sdf
@@ -0,0 +1,717 @@
+
+
+
+ -0.771000 0.188000 -0.790675 3.141593 -1.570796 3.141593
+
+ 0.771000 -0.188000 0.790675 0.000000 -0.000000 0.000000
+
+ 0.056408 0.000451 -0.001014 0.000000 -0.000000 0.000000
+
+ 0.011352
+ -0.000016
+ -0.000001
+ 0.011677
+ -0.000001
+ 0.011866
+
+ 0.681070
+
+
+ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000
+
+
+ model://pr2/meshes/forearm_v0/wrist_roll_L.stl
+ 1.000000 1.000000 1.000000
+ __default__
+
+
+
+
+
+ -1.000000
+ -1.000000
+ 0.000000 0.000000 0.000000
+ 0.000000
+ 0.000000
+
+
+
+ 0.000000
+ 100000.000000
+
+
+
+ 0.000000
+ 0.200000
+ 1000000000000.000000
+ 1.000000
+ 0.000000
+ 0.001000
+
+
+
+ 0.000000
+
+
+ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000
+
+
+ model://pr2/meshes/forearm_v0/wrist_roll.stl
+ 1.000000 1.000000 1.000000
+ __default__
+
+
+
+
+
+ 1
+ 0.000000
+ 0.000000
+
+
+ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000
+
+
+ model://pr2/meshes/gripper_v0/gripper_palm.dae
+ 1.000000 1.000000 1.000000
+ __default__
+
+
+ 1
+ 0.000000
+ 0.000000
+
+ 1
+ 0
+ 0
+
+
+
+ 0.847910 -0.178000 0.790675 0.000000 -0.000000 0.000000
+
+ 0.035980 0.017300 -0.001640 0.000000 -0.000000 0.000000
+
+ 0.000078
+ 0.000001
+ -0.000010
+ 0.000197
+ -0.000003
+ 0.000181
+
+ 0.171260
+
+
+ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000
+
+
+ model://pr2/meshes/gripper_v0/l_finger.stl
+ 1.000000 1.000000 1.000000
+ __default__
+
+
+
+
+
+ 500.000000
+ 500.000000
+ 0.000000 0.000000 0.000000
+ 0.000000
+ 0.000000
+
+
+
+ 0.000000
+ 100000.000000
+
+
+
+ 0.000000
+ 0.200000
+ 1000000.000000
+ 1.000000
+ 0.000000
+ 0.001000
+
+
+
+ 0.000000
+
+
+ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000
+
+
+ model://pr2/meshes/gripper_v0/l_finger.dae
+ 1.000000 1.000000 1.000000
+ __default__
+
+
+ 1
+ 0.000000
+ 0.000000
+
+ 1
+ 0
+ 0
+
+
+
+ 0.939280 -0.173050 0.790675 0.000000 -0.000000 0.000000
+
+ 0.004230 0.002840 0.000000 0.000000 -0.000000 0.000000
+
+ 0.000008
+ 0.000006
+ 0.000000
+ 0.000010
+ 0.000000
+ 0.000015
+
+ 0.044190
+
+
+ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000
+
+
+ model://pr2/meshes/gripper_v0/l_finger_tip.stl
+ 1.000000 1.000000 1.000000
+ __default__
+
+
+
+
+
+ 500.000000
+ 500.000000
+ 0.000000 0.000000 0.000000
+ 0.000000
+ 0.000000
+
+
+
+ 0.000000
+ 100000.000000
+
+
+
+ 0.000000
+ 0.200000
+ 10000000.000000
+ 1.000000
+ 0.000000
+ 0.001000
+
+
+
+ 0.000000
+
+
+ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000
+
+
+ model://pr2/meshes/gripper_v0/l_finger_tip.dae
+ 1.000000 1.000000 1.000000
+ __default__
+
+
+ 1
+ 0.000000
+ 0.000000
+
+
+ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000
+
+ r_gripper_l_finger_tip_link_geom
+ __default_topic__
+
+ 0
+ 100.000000
+ 0
+
+ 1
+ 0
+ 0
+
+
+
+ 0.939280 -0.188000 0.790675 0.000000 -0.000000 0.000000
+
+ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000
+
+ 0.001000
+ 0.000000
+ 0.000000
+ 0.001000
+ 0.000000
+ 0.001000
+
+ 0.010000
+
+ 1
+ 0
+ 0
+
+
+
+ 0.939280 -0.188000 0.790675 0.000000 -0.000000 0.000000
+
+ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000
+
+ 0.000100
+ 0.000000
+ 0.000000
+ 0.000100
+ 0.000000
+ 0.000100
+
+ 0.010000
+
+ 1
+ 0
+ 0
+
+
+
+ 0.847910 -0.198000 0.790675 0.000000 -0.000000 0.000000
+
+ 0.035760 -0.017360 -0.000950 0.000000 -0.000000 0.000000
+
+ 0.000077
+ -0.000002
+ -0.000008
+ 0.000198
+ 0.000002
+ 0.000181
+
+ 0.173890
+
+
+ 0.000000 0.000000 0.000000 -3.141590 -0.000000 0.000000
+
+
+ model://pr2/meshes/gripper_v0/l_finger.stl
+ 1.000000 1.000000 1.000000
+ __default__
+
+
+
+
+
+ 500.000000
+ 500.000000
+ 0.000000 0.000000 0.000000
+ 0.000000
+ 0.000000
+
+
+
+ 0.000000
+ 100000.000000
+
+
+
+ 0.000000
+ 0.200000
+ 1000000.000000
+ 1.000000
+ 0.000000
+ 0.001000
+
+
+
+ 0.000000
+
+
+ 0.000000 0.000000 0.000000 -3.141590 0.000000 0.000000
+
+
+ model://pr2/meshes/gripper_v0/l_finger.dae
+ 1.000000 1.000000 1.000000
+ __default__
+
+
+ 1
+ 0.000000
+ 0.000000
+
+ 1
+ 0
+ 0
+
+
+
+ 0.939280 -0.202950 0.790675 0.000000 -0.000000 0.000000
+
+ 0.004230 -0.002840 0.000000 0.000000 -0.000000 0.000000
+
+ 0.000008
+ -0.000006
+ 0.000000
+ 0.000010
+ 0.000000
+ 0.000015
+
+ 0.044190
+
+
+ 0.000000 0.000000 0.000000 -3.141590 -0.000000 0.000000
+
+
+ model://pr2/meshes/gripper_v0/l_finger_tip.stl
+ 1.000000 1.000000 1.000000
+ __default__
+
+
+
+
+
+ 500.000000
+ 500.000000
+ 0.000000 0.000000 0.000000
+ 0.000000
+ 0.000000
+
+
+
+ 0.000000
+ 100000.000000
+
+
+
+ 0.000000
+ 0.200000
+ 10000000.000000
+ 1.000000
+ 0.000000
+ 0.001000
+
+
+
+ 0.000000
+
+
+ 0.000000 0.000000 0.000000 -3.141590 0.000000 0.000000
+
+
+ model://pr2/meshes/gripper_v0/l_finger_tip.dae
+ 1.000000 1.000000 1.000000
+ __default__
+
+
+ 1
+ 0.000000
+ 0.000000
+
+
+ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000
+
+ r_gripper_r_finger_tip_link_geom
+ __default_topic__
+
+ 0
+ 100.000000
+ 0
+
+ 1
+ 0
+ 0
+
+
+
+ -0.150000 0.000000 0.751000 0.000000 -0.000000 0.000000
+
+ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000
+
+ 0.001000
+ 0.000000
+ 0.000000
+ 0.001000
+ 0.000000
+ 0.001000
+
+ 1.000000
+
+ 1
+ 0
+ 0
+
+
+
+ 0.829910 -0.157000 0.790675 0.000000 -0.000000 0.000000
+
+ 0.035980 0.017300 -0.001640 0.000000 -0.000000 0.000000
+
+ 0.000078
+ 0.000001
+ -0.000010
+ 0.000197
+ -0.000003
+ 0.000181
+
+ 0.171260
+
+ 1
+ 0
+ 0
+
+
+
+ 0.829910 -0.219000 0.790675 0.000000 -0.000000 0.000000
+
+ 0.035760 -0.017360 -0.000950 0.000000 -0.000000 0.000000
+
+ 0.000077
+ -0.000002
+ -0.000008
+ 0.000198
+ 0.000002
+ 0.000181
+
+ 0.173890
+
+ 1
+ 0
+ 0
+
+
+
+ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000
+ r_wrist_roll_link
+ r_gripper_l_finger_link
+
+
+ 0.020000
+ 0.000000
+
+
+ 0.000000
+ 0.548000
+ 0.000000
+ 0.000000
+
+ 0.000000 0.000000 1.000000
+
+
+
+ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000
+ r_gripper_l_finger_link
+ r_gripper_l_finger_tip_link
+
+
+ 0.001000
+ 0.000000
+
+
+ 0.000000
+ 0.548000
+ 0.000000
+ 0.000000
+
+ 0.000000 0.000000 -1.000000
+
+
+
+ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000
+ r_wrist_roll_link
+ r_gripper_motor_slider_link
+
+
+ 0.000000
+ 0.000000
+
+
+ -0.100000
+ 0.100000
+ 0.000000
+ 0.000000
+
+ 1.000000 0.000000 0.000000
+
+
+
+ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000
+ r_gripper_motor_slider_link
+ r_gripper_motor_screw_link
+
+
+ 0.000100
+ 0.000000
+
+
+ -10000000000000000.000000
+ 10000000000000000.000000
+ 0.000000
+ 0.000000
+
+ 0.000000 1.000000 0.000000
+
+
+
+ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000
+ r_wrist_roll_link
+ r_gripper_r_finger_link
+
+
+ 0.020000
+ 0.000000
+
+
+ 0.000000
+ 0.548000
+ 0.000000
+ 0.000000
+
+ 0.000000 0.000000 -1.000000
+
+
+
+ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000
+ r_gripper_r_finger_link
+ r_gripper_r_finger_tip_link
+
+
+ 0.001000
+ 0.000000
+
+
+ 0.000000
+ 0.548000
+ 0.000000
+ 0.000000
+
+ 0.000000 0.000000 1.000000
+
+
+
+ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000
+ r_gripper_r_finger_tip_link
+ r_gripper_motor_screw_link
+ -3141.600000
+
+
+ 0.000000
+ 0.000000
+
+
+ -10000000000000000.000000
+ 10000000000000000.000000
+ 0.000000
+ 0.000000
+
+ 0.000000 1.000000 0.000000
+
+
+
+ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000
+ r_gripper_l_finger_tip_link
+ r_gripper_motor_screw_link
+ 3141.600000
+
+
+ 0.000000
+ 0.000000
+
+
+ -10000000000000000.000000
+ 10000000000000000.000000
+ 0.000000
+ 0.000000
+
+ 0.000000 1.000000 0.000000
+
+
+
+ 0.058910 -0.031000 0.000000 0.000000 -0.000000 0.000000
+ r_gripper_r_parallel_link
+ r_wrist_roll_link
+
+
+ 0.200000
+ 0.000000
+
+
+ -10000000000000000.000000
+ 10000000000000000.000000
+ 0.000000
+ 0.000000
+
+ 0.000000 0.000000 -1.000000
+
+
+
+ 0.058910 0.031000 0.000000 0.000000 -0.000000 0.000000
+ r_gripper_l_parallel_link
+ r_wrist_roll_link
+
+
+ 0.200000
+ 0.000000
+
+
+ -10000000000000000.000000
+ 10000000000000000.000000
+ 0.000000
+ 0.000000
+
+ 0.000000 0.000000 1.000000
+
+
+
+ -0.018000 -0.021000 0.000000 0.000000 -0.000000 0.000000
+ r_gripper_r_parallel_link
+ r_gripper_r_finger_tip_link
+
+
+ 0.000000
+ 0.000000
+
+
+ -10000000000000000.000000
+ 10000000000000000.000000
+ 0.000000
+ 0.000000
+
+ 0.000000 0.000000 1.000000
+
+
+
+ -0.018000 0.021000 0.000000 0.000000 -0.000000 0.000000
+ r_gripper_l_parallel_link
+ r_gripper_l_finger_tip_link
+
+
+ 0.000000
+ 0.000000
+
+
+ -10000000000000000.000000
+ 10000000000000000.000000
+ 0.000000
+ 0.000000
+
+ 0.000000 0.000000 1.000000
+
+
+
+ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000
+ r_gripper_r_finger_tip_link
+ r_gripper_l_finger_tip_link
+
+
+ 0.000000
+ 0.000000
+
+
+ -10000000000000000.000000
+ 10000000000000000.000000
+ 0.000000
+ 0.000000
+
+ 0.000000 1.000000 0.000000
+
+
+ 0
+
+
+Success
diff --git a/simple_arm_gripper/manifest.xml b/simple_arm_gripper/manifest.xml
index d9f2ea8..8aace6d 100644
--- a/simple_arm_gripper/manifest.xml
+++ b/simple_arm_gripper/manifest.xml
@@ -10,6 +10,13 @@
hsu@osrfoundation.org
+
+
+ model://simple_gripper
+ 1.0
+
+
+
A simple arm and pinch gripper.
diff --git a/simple_arm_gripper/model.sdf b/simple_arm_gripper/model.sdf
index a2d31a5..88b52e4 100644
--- a/simple_arm_gripper/model.sdf
+++ b/simple_arm_gripper/model.sdf
@@ -7,6 +7,7 @@
model://simple_gripper
+ 1.8 0 1 0 0 0
diff --git a/simple_gripper/model.sdf b/simple_gripper/model.sdf
index c128e4d..1171798 100644
--- a/simple_gripper/model.sdf
+++ b/simple_gripper/model.sdf
@@ -9,7 +9,7 @@
- 0.2 0.2 1.0
+ 0.05 0.05 1.0
@@ -23,7 +23,7 @@
- 0.2 0.2 1.0
+ 0.05 0.05 1.0
@@ -231,14 +231,6 @@
0 0 1
-
- riser
- world
-
- 00
- 0 0 1
-
-