From 43812c328e2fdcb2bebe900fe28b7513f2103572 Mon Sep 17 00:00:00 2001 From: John Hsu Date: Wed, 10 Oct 2012 16:48:17 -0700 Subject: [PATCH 1/8] adding pr2 gripper model (uses pr2 model meshes) --- pr2_gripper/manifest.xml | 20 ++ pr2_gripper/model.sdf | 716 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 736 insertions(+) create mode 100644 pr2_gripper/manifest.xml create mode 100644 pr2_gripper/model.sdf diff --git a/pr2_gripper/manifest.xml b/pr2_gripper/manifest.xml new file mode 100644 index 0000000..962f051 --- /dev/null +++ b/pr2_gripper/manifest.xml @@ -0,0 +1,20 @@ + + + + PR2 Gripper + 1.0 + model.sdf + + + John Hsu + hsu@osrfoundation.org + + + + The Willow Garage PR2 gripper model. + + + + pr2 + + diff --git a/pr2_gripper/model.sdf b/pr2_gripper/model.sdf new file mode 100644 index 0000000..587f8af --- /dev/null +++ b/pr2_gripper/model.sdf @@ -0,0 +1,716 @@ + + + -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/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/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/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/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/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/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/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/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/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/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/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 From 37cde3d5dcd9c135f2ef2bb128d1ac5d0911b31a Mon Sep 17 00:00:00 2001 From: John Hsu Date: Wed, 10 Oct 2012 16:49:35 -0700 Subject: [PATCH 2/8] update pr2_gripper model --- pr2_gripper/manifest.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pr2_gripper/manifest.xml b/pr2_gripper/manifest.xml index 962f051..1ca1c62 100644 --- a/pr2_gripper/manifest.xml +++ b/pr2_gripper/manifest.xml @@ -15,6 +15,9 @@ - pr2 + + model://pr2 + 1.0 + From 855557345fb8ee81f7bbdeeb357ffddbac1bbcd1 Mon Sep 17 00:00:00 2001 From: John Hsu Date: Wed, 10 Oct 2012 16:50:48 -0700 Subject: [PATCH 3/8] add pr2_gripper to CMakeLists.txt --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) 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 From 201c32d06888a451735101b227e7d5c423694958 Mon Sep 17 00:00:00 2001 From: John Hsu Date: Wed, 10 Oct 2012 16:51:08 -0700 Subject: [PATCH 4/8] add pr2_gripper to database manifest.xml --- manifest.xml | 1 + 1 file changed, 1 insertion(+) 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 From aa7234b28719441b3888e6cdae8dbbb661be3354 Mon Sep 17 00:00:00 2001 From: John Hsu Date: Wed, 10 Oct 2012 16:55:59 -0700 Subject: [PATCH 5/8] fix pr2_gripper mesh paths --- pr2_gripper/model.sdf | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pr2_gripper/model.sdf b/pr2_gripper/model.sdf index 587f8af..295f3e3 100644 --- a/pr2_gripper/model.sdf +++ b/pr2_gripper/model.sdf @@ -1,3 +1,4 @@ + -0.771000 0.188000 -0.790675 3.141593 -1.570796 3.141593 @@ -19,7 +20,7 @@ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000 - model://pr2/forearm_v0/wrist_roll_L.stl + model://pr2/meshes/forearm_v0/wrist_roll_L.stl 1.000000 1.000000 1.000000 __default__ @@ -55,7 +56,7 @@ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000 - model://pr2/forearm_v0/wrist_roll.stl + model://pr2/meshes/forearm_v0/wrist_roll.stl 1.000000 1.000000 1.000000 __default__ @@ -73,7 +74,7 @@ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000 - model://pr2/gripper_v0/gripper_palm.dae + model://pr2/meshes/gripper_v0/gripper_palm.dae 1.000000 1.000000 1.000000 __default__ @@ -105,7 +106,7 @@ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000 - model://pr2/gripper_v0/l_finger.stl + model://pr2/meshes/gripper_v0/l_finger.stl 1.000000 1.000000 1.000000 __default__ @@ -141,7 +142,7 @@ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000 - model://pr2/gripper_v0/l_finger.dae + model://pr2/meshes/gripper_v0/l_finger.dae 1.000000 1.000000 1.000000 __default__ @@ -173,7 +174,7 @@ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000 - model://pr2/gripper_v0/l_finger_tip.stl + model://pr2/meshes/gripper_v0/l_finger_tip.stl 1.000000 1.000000 1.000000 __default__ @@ -209,7 +210,7 @@ 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000 - model://pr2/gripper_v0/l_finger_tip.dae + model://pr2/meshes/gripper_v0/l_finger_tip.dae 1.000000 1.000000 1.000000 __default__ @@ -289,7 +290,7 @@ 0.000000 0.000000 0.000000 -3.141590 -0.000000 0.000000 - model://pr2/gripper_v0/l_finger.stl + model://pr2/meshes/gripper_v0/l_finger.stl 1.000000 1.000000 1.000000 __default__ @@ -325,7 +326,7 @@ 0.000000 0.000000 0.000000 -3.141590 0.000000 0.000000 - model://pr2/gripper_v0/l_finger.dae + model://pr2/meshes/gripper_v0/l_finger.dae 1.000000 1.000000 1.000000 __default__ @@ -357,7 +358,7 @@ 0.000000 0.000000 0.000000 -3.141590 -0.000000 0.000000 - model://pr2/gripper_v0/l_finger_tip.stl + model://pr2/meshes/gripper_v0/l_finger_tip.stl 1.000000 1.000000 1.000000 __default__ @@ -393,7 +394,7 @@ 0.000000 0.000000 0.000000 -3.141590 0.000000 0.000000 - model://pr2/gripper_v0/l_finger_tip.dae + model://pr2/meshes/gripper_v0/l_finger_tip.dae 1.000000 1.000000 1.000000 __default__ From af301c5e96b1e69460bf101be6375b21fd6d5f7f Mon Sep 17 00:00:00 2001 From: John Hsu Date: Wed, 10 Oct 2012 17:11:36 -0700 Subject: [PATCH 6/8] add dependency for simple_arm_gripper --- simple_arm_gripper/manifest.xml | 7 +++++++ 1 file changed, 7 insertions(+) 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. From bcca3bb67f3590f59a9d58315aadfbcda4962d0a Mon Sep 17 00:00:00 2001 From: John Hsu Date: Wed, 10 Oct 2012 17:16:46 -0700 Subject: [PATCH 7/8] fix simple arm simple gripper model --- simple_arm_gripper/model.sdf | 1 + simple_gripper/model.sdf | 12 ++---------- 2 files changed, 3 insertions(+), 10 deletions(-) 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 e9fa1e3..01e2c18 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 @@ -249,14 +249,6 @@ 0 0 1 - - riser - world - - 00 - 0 0 1 - - From 918e4f33ccab21d7e8b9f9ae53cdd28e89c4258a Mon Sep 17 00:00:00 2001 From: John Hsu Date: Fri, 12 Oct 2012 10:11:30 -0700 Subject: [PATCH 8/8] fix projector direction --- pr2/model.sdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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