Skip to content

Commit 19a6e3d

Browse files
authored
Merge pull request #2 from XR-Robotics/dev/mujoco_gripper
Dev/mujoco gripper
2 parents dc11494 + 81a7d49 commit 19a6e3d

File tree

8 files changed

+1474
-38
lines changed

8 files changed

+1474
-38
lines changed

assets/galaxea/A1X/dual_a1x.xml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -159,17 +159,22 @@
159159
<position name="left_arm_joint5" joint="left_arm_joint5" class="position_arm" ctrlrange="-1.5708 1.5708" />
160160
<position name="left_arm_joint6" joint="left_arm_joint6" class="position_arm" ctrlrange="-2.8798 2.8798" />
161161
<position name="left_gripper_finger_joint1" joint="left_gripper_finger_joint1" class="position_gripper" ctrlrange="0 0.05" />
162-
<position name="left_gripper_finger_joint2" joint="left_gripper_finger_joint2" class="position_gripper" ctrlrange="-0.05 0" />
162+
<!-- <position name="left_gripper_finger_joint2" joint="left_gripper_finger_joint2" class="position_gripper" ctrlrange="-0.05 0" /> -->
163163
<position name="right_arm_joint1" joint="right_arm_joint1" class="position_arm" ctrlrange="-2.8798 2.8798" />
164164
<position name="right_arm_joint2" joint="right_arm_joint2" class="position_arm" ctrlrange="0 3.1416" />
165165
<position name="right_arm_joint3" joint="right_arm_joint3" class="position_arm" ctrlrange="-3.3161 0" />
166166
<position name="right_arm_joint4" joint="right_arm_joint4" class="position_arm" ctrlrange="-1.5708 1.5708" />
167167
<position name="right_arm_joint5" joint="right_arm_joint5" class="position_arm" ctrlrange="-1.5708 1.5708" />
168168
<position name="right_arm_joint6" joint="right_arm_joint6" class="position_arm" ctrlrange="-2.8798 2.8798" />
169169
<position name="right_gripper_finger_joint1" joint="right_gripper_finger_joint1" class="position_gripper" ctrlrange="0 0.05" />
170-
<position name="right_gripper_finger_joint2" joint="right_gripper_finger_joint2" class="position_gripper" ctrlrange="-0.05 0" />
170+
<!-- <position name="right_gripper_finger_joint2" joint="right_gripper_finger_joint2" class="position_gripper" ctrlrange="-0.05 0" /> -->
171171
</actuator>
172172

173+
<contact>
174+
<exclude body1="right_gripper_finger_link1" body2="right_gripper_finger_link2" />
175+
<exclude body1="left_gripper_finger_link1" body2="left_gripper_finger_link2" />
176+
</contact>
177+
173178
<equality>
174179
<joint name="right_gripper_constraint" joint1="right_gripper_finger_joint1" joint2="right_gripper_finger_joint2" polycoef="0 -1 0 0 0" />
175180
<joint name="left_gripper_constraint" joint1="left_gripper_finger_joint1" joint2="left_gripper_finger_joint2" polycoef="0 -1 0 0 0" />
@@ -197,9 +202,9 @@
197202
<actuatorpos name="left_gripper_finger_joint1_p" actuator="left_gripper_finger_joint1" />
198203
<actuatorvel name="left_gripper_finger_joint1_v" actuator="left_gripper_finger_joint1" />
199204
<actuatorfrc name="left_gripper_finger_joint1_f" actuator="left_gripper_finger_joint1" noise="0.001" />
200-
<actuatorpos name="left_gripper_finger_joint2_p" actuator="left_gripper_finger_joint2" />
205+
<!-- <actuatorpos name="left_gripper_finger_joint2_p" actuator="left_gripper_finger_joint2" />
201206
<actuatorvel name="left_gripper_finger_joint2_v" actuator="left_gripper_finger_joint2" />
202-
<actuatorfrc name="left_gripper_finger_joint2_f" actuator="left_gripper_finger_joint2" noise="0.001" />
207+
<actuatorfrc name="left_gripper_finger_joint2_f" actuator="left_gripper_finger_joint2" noise="0.001" /> -->
203208
<actuatorpos name="right_arm_joint1_p" actuator="right_arm_joint1" />
204209
<actuatorvel name="right_arm_joint1_v" actuator="right_arm_joint1" />
205210
<actuatorfrc name="right_arm_joint1_f" actuator="right_arm_joint1" noise="0.001" />
@@ -221,13 +226,13 @@
221226
<actuatorpos name="right_gripper_finger_joint1_p" actuator="right_gripper_finger_joint1" />
222227
<actuatorvel name="right_gripper_finger_joint1_v" actuator="right_gripper_finger_joint1" />
223228
<actuatorfrc name="right_gripper_finger_joint1_f" actuator="right_gripper_finger_joint1" noise="0.001" />
224-
<actuatorpos name="right_gripper_finger_joint2_p" actuator="right_gripper_finger_joint2" />
229+
<!-- <actuatorpos name="right_gripper_finger_joint2_p" actuator="right_gripper_finger_joint2" />
225230
<actuatorvel name="right_gripper_finger_joint2_v" actuator="right_gripper_finger_joint2" />
226-
<actuatorfrc name="right_gripper_finger_joint2_f" actuator="right_gripper_finger_joint2" noise="0.001" />
231+
<actuatorfrc name="right_gripper_finger_joint2_f" actuator="right_gripper_finger_joint2" noise="0.001" /> -->
227232
<framequat name="orientation" objtype="site" noise="0.001" objname="imu" />
228233
<gyro name="angular-velocity" site="imu" noise="0.005" cutoff="34.9" />
229234
</sensor>
230235
<keyframe>
231-
<key name="home" qpos="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0" ctrl="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0" />
236+
<key name="home" qpos="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0" ctrl="0 0 0 0 0 0 0 0 0 0 0 0 0 0" />
232237
</keyframe>
233238
</mujoco>

0 commit comments

Comments
 (0)