Skip to content

Commit dd02c3e

Browse files
committed
Fix xacro and srdf
1 parent 33c8de0 commit dd02c3e

3 files changed

Lines changed: 11 additions & 8 deletions

File tree

Industrial/robotiq_description/urdf/robotiq_85_gripper.urdf.xacro

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<axis xyz="0 0 1"/>
4747
<origin rpy="0.0 0.0 0.0" xyz="0.05490451627 -0.03060114443 0.0"/>
4848
<limit lower="-3.14" upper="3.14" velocity="100.0" effort="1000"/>
49-
<mimic joint="${prefix}robotiq_85_left_knuckle_joint"/>
49+
<mimic joint="${prefix}robotiq_85_left_knuckle_joint" multiplier="1.0"/>
5050
</joint>
5151

5252
<link name="${prefix}robotiq_85_left_knuckle_link">
@@ -147,7 +147,7 @@
147147
<axis xyz="0 0 1"/>
148148
<origin xyz="0.06142 0.0127 0" rpy="${pi} 0.0 0.0" />
149149
<limit lower="-3.14" upper="3.14" velocity="100.0" effort="0.1"/>
150-
<mimic joint="${prefix}robotiq_85_left_knuckle_joint" offset="0"/>
150+
<mimic joint="${prefix}robotiq_85_left_knuckle_joint" multiplier="1.0" offset="0"/>
151151
</joint>
152152

153153
<joint name="${prefix}robotiq_85_right_inner_knuckle_joint" type="continuous">
@@ -156,7 +156,7 @@
156156
<axis xyz="0 0 1"/>
157157
<origin xyz="0.06142 -0.0127 0" rpy="0 0 0"/>
158158
<limit lower="-3.14" upper="3.14" velocity="100.0" effort="0.1"/>
159-
<mimic joint="${prefix}robotiq_85_left_knuckle_joint" offset="0"/>
159+
<mimic joint="${prefix}robotiq_85_left_knuckle_joint" multiplier="1.0" offset="0"/>
160160
</joint>
161161

162162
<link name="${prefix}robotiq_85_left_inner_knuckle_link">

Industrial/ros2_SimRealRobotControl_gz/ros2srrc_endeffectors/robotiq_2f85/urdf/robotiq_2f85_macro.urdf.xacro

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,8 @@
166166
<child link="robotiq_85_right_knuckle_link"/>
167167
<axis xyz="0 0 1"/>
168168
<origin rpy="0 0 0" xyz="0.05490451627 -0.03060114443 0.0"/>
169-
<mimic joint="robotiq_85_left_knuckle_joint" multiplier="1"/>
169+
<limit lower="-0.05" upper="0.80285" velocity="0.5" effort="1000"/>
170+
<dynamics damping="1.0" friction="1.0"/>
170171
</joint>
171172

172173
<!-- Robotiq: left_finger -->
@@ -251,7 +252,7 @@
251252
<child link="robotiq_85_left_inner_knuckle_link"/>
252253
<axis xyz="0 0 1"/>
253254
<origin xyz="0.06142 0.0127 0" rpy="${pi} 0.0 0.0" />
254-
<mimic joint="robotiq_85_left_knuckle_joint" multiplier="1"/>
255+
<limit lower="-0.05" upper="0.80285" velocity="0.5" effort="1000"/>
255256
<dynamics damping="1.0" friction="1.0"/>
256257
</joint>
257258

@@ -281,7 +282,7 @@
281282
<child link="robotiq_85_right_inner_knuckle_link"/>
282283
<axis xyz="0 0 1"/>
283284
<origin xyz="0.06142 -0.0127 0" rpy="0 0 0"/>
284-
<mimic joint="robotiq_85_left_knuckle_joint" multiplier="1"/>
285+
<limit lower="-0.05" upper="0.80285" velocity="0.5" effort="1000"/>
285286
<dynamics damping="1.0" friction="1.0"/>
286287
</joint>
287288

@@ -313,7 +314,7 @@
313314
<child link="robotiq_85_left_finger_tip_link"/>
314315
<axis xyz="0 0 1"/>
315316
<origin xyz="0.04303959807 -0.03759940821 0.0" rpy="0.0 0.0 0.0"/>
316-
<mimic joint="robotiq_85_left_knuckle_joint" multiplier="-1"/>
317+
<limit lower="-0.80285" upper="0.05" velocity="0.5" effort="1000"/>
317318
<dynamics damping="1.0" friction="1.0"/>
318319
</joint>
319320

@@ -345,7 +346,7 @@
345346
<child link="robotiq_85_right_finger_tip_link"/>
346347
<axis xyz="0 0 1"/>
347348
<origin rpy="0.0 0.0 0.0" xyz="0.04303959807 -0.03759940821 0.0"/>
348-
<mimic joint="robotiq_85_left_knuckle_joint" multiplier="-1"/>
349+
<limit lower="-0.80285" upper="0.05" velocity="0.5" effort="1000"/>
349350
<dynamics damping="1.0" friction="1.0"/>
350351
</joint>
351352

Industrial/ur5_gripper_moveit_config/srdf/ur5_robotiq.srdf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@
5555
<passive_joint name="robotiq_85_right_inner_knuckle_joint" />
5656
<passive_joint name="robotiq_85_left_finger_tip_joint" />
5757
<passive_joint name="robotiq_85_right_finger_tip_joint" />
58+
<passive_joint name="robotiq_85_left_finger_joint" />
59+
<passive_joint name="robotiq_85_right_finger_joint" />
5860

5961
<!--DISABLE COLLISIONS-->
6062
<disable_collisions link1="base_link" link2="base_link_inertia" reason="Adjacent"/>

0 commit comments

Comments
 (0)