Skip to content

Commit

Permalink
Update SRDF for collision model
Browse files Browse the repository at this point in the history
franka_description got updated with a more coarse collision model matching the internal
self-collision detection [1], so the SRDF needs to be adapted. Updated collision configuration
was obtained by re-running the setup assistant.

Closes moveit#18. Resolves moveit/moveit#1210, resolves frankaemika/franka_ros#39.

[1] frankaemika/franka_ros@e52c03a
  • Loading branch information
fwalch committed Jul 26, 2019
1 parent e3a431a commit 46de090
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
8 changes: 4 additions & 4 deletions config/panda_arm.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@
<disable_collisions link1="panda_link0" link2="panda_link3" reason="Never" />
<disable_collisions link1="panda_link0" link2="panda_link4" reason="Never" />
<disable_collisions link1="panda_link1" link2="panda_link2" reason="Adjacent" />
<disable_collisions link1="panda_link1" link2="panda_link3" reason="Never" />
<disable_collisions link1="panda_link1" link2="panda_link3" reason="Default" />
<disable_collisions link1="panda_link1" link2="panda_link4" reason="Never" />
<disable_collisions link1="panda_link2" link2="panda_link3" reason="Adjacent" />
<disable_collisions link1="panda_link2" link2="panda_link4" reason="Never" />
<disable_collisions link1="panda_link2" link2="panda_link6" reason="Never" />
<disable_collisions link1="panda_link3" link2="panda_link4" reason="Adjacent" />
<disable_collisions link1="panda_link3" link2="panda_link5" reason="Never" />
<disable_collisions link1="panda_link3" link2="panda_link6" reason="Never" />
<disable_collisions link1="panda_link3" link2="panda_link7" reason="Never" />
<disable_collisions link1="panda_link4" link2="panda_link5" reason="Adjacent" />
<disable_collisions link1="panda_link4" link2="panda_link6" reason="Never" />
<disable_collisions link1="panda_link4" link2="panda_link7" reason="Never" />
<disable_collisions link1="panda_link4" link2="panda_link8" reason="Never" />
<disable_collisions link1="panda_link5" link2="panda_link6" reason="Adjacent" />
<disable_collisions link1="panda_link5" link2="panda_link7" reason="Default" />
<disable_collisions link1="panda_link6" link2="panda_link7" reason="Adjacent" />
<disable_collisions link1="panda_link7" link2="panda_link8" reason="Adjacent" />
</xacro:macro>
</robot>
11 changes: 7 additions & 4 deletions config/panda_arm_hand.srdf.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,19 @@
<!--END EFFECTOR: Purpose: Represent information about an end effector.-->
<end_effector name="hand" parent_link="panda_link8" group="hand" parent_group="panda_arm" />
<!--DISABLE COLLISIONS: By default it is assumed that any link of the robot could potentially come into collision with any other link in the robot. This tag disables collision checking between a specified pair of links. -->
<disable_collisions link1="panda_hand" link2="panda_link3" reason="Never" />
<disable_collisions link1="panda_hand" link2="panda_link4" reason="Never" />
<disable_collisions link1="panda_hand" link2="panda_link5" reason="Default" />
<disable_collisions link1="panda_hand" link2="panda_link6" reason="Never" />
<disable_collisions link1="panda_hand" link2="panda_link7" reason="Adjacent" />
<disable_collisions link1="panda_leftfinger" link2="panda_link3" reason="Never" />
<disable_collisions link1="panda_hand" link2="panda_link7" reason="Default" />
<disable_collisions link1="panda_hand" link2="panda_link8" reason="Adjacent" />
<disable_collisions link1="panda_leftfinger" link2="panda_link4" reason="Never" />
<disable_collisions link1="panda_leftfinger" link2="panda_link5" reason="Default" />
<disable_collisions link1="panda_leftfinger" link2="panda_link6" reason="Never" />
<disable_collisions link1="panda_leftfinger" link2="panda_link7" reason="Never" />
<disable_collisions link1="panda_link3" link2="panda_rightfinger" reason="Never" />
<disable_collisions link1="panda_leftfinger" link2="panda_link8" reason="Never" />
<disable_collisions link1="panda_link4" link2="panda_rightfinger" reason="Never" />
<disable_collisions link1="panda_link5" link2="panda_rightfinger" reason="Default" />
<disable_collisions link1="panda_link6" link2="panda_rightfinger" reason="Never" />
<disable_collisions link1="panda_link7" link2="panda_rightfinger" reason="Never" />
<disable_collisions link1="panda_link8" link2="panda_rightfinger" reason="Never" />
</robot>

0 comments on commit 46de090

Please sign in to comment.