Moves finger collision geometries to the finger joints

This commit moves the finger collision geometries to the finger joints. This was done to prevent errors in third party libaries. Moveit for example expects a collision geometry in each joint that can be controlled.
frankaemika · Sep 28, 2021 · e7fbd0b · e7fbd0b
1 parent cf28809
commit e7fbd0b
Showing 1 changed file with 20 additions and 14 deletions.
diff --git a/franka_description/robots/hand.xacro b/franka_description/robots/hand.xacro
@@ -33,39 +33,45 @@
           <sphere radius="${0.04+safety_distance}"  />
         </geometry>
       </collision>
-      <collision>
-        <origin xyz="0 0 0.1" rpy="0 ${pi/2} ${pi/2}"/>
+    </link>
+    <link name="${ns}_leftfinger">
+      <visual>
         <geometry>
-          <cylinder radius="${0.02+safety_distance}" length="0.1" />
+          <mesh filename="package://franka_description/meshes/visual/finger.dae"/>
         </geometry>
-      </collision>
+      </visual>
       <collision>
-        <origin xyz="0 -0.05 0.1" rpy="0 0 0"/>
+        <origin xyz="0 0.01 0.0415" rpy="0 0 0"/>
         <geometry>
           <sphere radius="${0.02+safety_distance}"  />
         </geometry>
       </collision>
       <collision>
-        <origin xyz="0 0.05 0.1" rpy="0 0 0"/>
+        <origin xyz="0 -0.015 0.0416" rpy="0 ${pi/2} ${pi/2}"/>
         <geometry>
-          <sphere radius="${0.02+safety_distance}"  />
+          <cylinder radius="${0.02+safety_distance}" length="0.05" />
         </geometry>
       </collision>
     </link>
-    <link name="${ns}_leftfinger">
-      <visual>
-        <geometry>
-          <mesh filename="package://franka_description/meshes/visual/finger.dae"/>
-        </geometry>
-      </visual>
-    </link>
     <link name="${ns}_rightfinger">
       <visual>
         <origin xyz="0 0 0" rpy="0 0 ${pi}"/>
         <geometry>
           <mesh filename="package://franka_description/meshes/visual/finger.dae"/>
         </geometry>
       </visual>
+      <collision>
+        <origin xyz="0 -0.01 0.0415" rpy="0 0 0"/>
+        <geometry>
+          <sphere radius="${0.02+safety_distance}"  />
+        </geometry>
+      </collision>
+      <collision>
+        <origin xyz="0 0.015 0.0416" rpy="0 ${pi/2} ${pi/2}"/>
+        <geometry>
+          <cylinder radius="${0.02+safety_distance}" length="0.05" />
+        </geometry>
+      </collision>
    </link>
     <joint name="${ns}_finger_joint1" type="prismatic">
       <parent link="${ns}_hand"/>