Skip to content

Commit

Permalink
Merge pull request #147 from rickstaa/improve_gazebo_hand_collision_g…
Browse files Browse the repository at this point in the history
…eometries

Improve gazebo hand/finger collision behavoir
  • Loading branch information
falfab authored Oct 13, 2021
2 parents 1922fc9 + 7327078 commit 38fa8a9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 18 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## 0.x - UNRELEASED

* Add realistic hand/finger collision geometries to the Gazebo robot description
* Add `joint_state_desired` publisher to `franka_gazebo`
* No further ROS Kinetic support, since [End-of-Life was in April 2021](http://wiki.ros.org/Distributions)

Expand Down
Binary file modified franka_description/meshes/collision/finger.stl
Binary file not shown.
22 changes: 4 additions & 18 deletions franka_description/robots/panda_gazebo.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -288,9 +288,8 @@
</geometry>
</visual>
<collision>
<origin xyz="0.0 0 0.0375" rpy="0 ${pi/2} ${pi/2}"/>
<geometry>
<box size="0.055 0.04 0.198" />
<mesh filename="package://franka_description/meshes/collision/hand.stl" />
</geometry>
</collision>
<inertial>
Expand All @@ -310,15 +309,8 @@
</geometry>
</visual>
<collision>
<origin xyz="0 0.015 0.03" rpy="0 0 0"/>
<geometry>
<box size="0.03 0.005 0.047" />
</geometry>
</collision>
<collision>
<origin xyz="0 0.007 0.045" rpy="0 0 0"/>
<geometry>
<box size="0.03 0.015 0.017" />
<mesh filename="package://franka_description/meshes/collision/finger.stl" />
</geometry>
</collision>
</link>
Expand All @@ -332,15 +324,9 @@
</geometry>
</visual>
<collision>
<origin xyz="0 -0.015 0.03" rpy="0 0 0"/>
<geometry>
<box size="0.03 0.005 0.047" />
</geometry>
</collision>
<collision>
<origin xyz="0 -0.007 0.045" rpy="0 0 0"/>
<origin xyz="0 0 0" rpy="0 0 ${pi}"/>
<geometry>
<box size="0.03 0.015 0.017" />
<mesh filename="package://franka_description/meshes/collision/finger.stl" />
</geometry>
</collision>
</link>
Expand Down

0 comments on commit 38fa8a9

Please sign in to comment.