Skip to content

Commit

Permalink
update actuator tags to use position (#40)
Browse files Browse the repository at this point in the history
Signed-off-by: Paul Gesel <[email protected]>
Co-authored-by: David Yackzan <[email protected]>
  • Loading branch information
pac48 and dyackzan authored Jul 16, 2024
1 parent 89b5923 commit ccc2a99
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 18 deletions.
17 changes: 8 additions & 9 deletions src/kinova_gen3_mujoco_config/description/mujoco/gen3_7dof.xml
Original file line number Diff line number Diff line change
Expand Up @@ -242,13 +242,13 @@
</worldbody>

<actuator>
<general class="kinova" name="joint_1" joint="joint_1" gainprm="800" biasprm="0 -800 -260"/>
<general class="kinova" name="joint_2" joint="joint_2" gainprm="800" biasprm="0 -800 -260"/>
<general class="kinova" name="joint_3" joint="joint_3" gainprm="260" biasprm="0 -260 -86"/>
<general class="kinova" name="joint_4" joint="joint_4" gainprm="260" biasprm="0 -260 -86"/>
<general class="kinova" name="joint_5" joint="joint_5" gainprm="130" biasprm="0 -130 -45"/>
<general class="kinova" name="joint_6" joint="joint_6" gainprm="130" biasprm="0 -130 -45"/>
<general class="kinova" name="joint_7" joint="joint_7" gainprm="130" biasprm="0 -130 -45"/>
<position class="kinova" name="joint_1" joint="joint_1" kp="800" kv="260"/>
<position class="kinova" name="joint_2" joint="joint_2" kp="800" kv="260"/>
<position class="kinova" name="joint_3" joint="joint_3" kp="260" kv="86"/>
<position class="kinova" name="joint_4" joint="joint_4" kp="260" kv="86"/>
<position class="kinova" name="joint_5" joint="joint_5" kp="130" kv="45"/>
<position class="kinova" name="joint_6" joint="joint_6" kp="130" kv="45"/>
<position class="kinova" name="joint_7" joint="joint_7" kp="130" kv="45"/>
</actuator>

<!-- Robotiq gripper contact -->
Expand Down Expand Up @@ -282,8 +282,7 @@
</equality>

<actuator>
<general class="2f85" name="robotiq_85_left_knuckle_joint" tendon="split" forcerange="-5 5" ctrlrange="0 .8"
gainprm="100 0 0" biasprm="0 -100 -150"/>
<position class="2f85" name="robotiq_85_left_knuckle_joint" tendon="split" forcerange="-5 5" ctrlrange="0 .8" kp="100" kv="100"/>
</actuator>

<sensor>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -260,13 +260,13 @@
</worldbody>

<actuator>
<general class="kinova" name="joint_1" joint="joint_1" gainprm="800" biasprm="0 -800 -260"/>
<general class="kinova" name="joint_2" joint="joint_2" gainprm="800" biasprm="0 -800 -260"/>
<general class="kinova" name="joint_3" joint="joint_3" gainprm="260" biasprm="0 -260 -86"/>
<general class="kinova" name="joint_4" joint="joint_4" gainprm="260" biasprm="0 -260 -86"/>
<general class="kinova" name="joint_5" joint="joint_5" gainprm="130" biasprm="0 -130 -45"/>
<general class="kinova" name="joint_6" joint="joint_6" gainprm="130" biasprm="0 -130 -45"/>
<general class="kinova" name="joint_7" joint="joint_7" gainprm="130" biasprm="0 -130 -45"/>
<position class="kinova" name="joint_1" joint="joint_1" kp="800" kv="260"/>
<position class="kinova" name="joint_2" joint="joint_2" kp="800" kv="260"/>
<position class="kinova" name="joint_3" joint="joint_3" kp="260" kv="86"/>
<position class="kinova" name="joint_4" joint="joint_4" kp="260" kv="86"/>
<position class="kinova" name="joint_5" joint="joint_5" kp="130" kv="45"/>
<position class="kinova" name="joint_6" joint="joint_6" kp="130" kv="45"/>
<position class="kinova" name="joint_7" joint="joint_7" kp="130" kv="45"/>
</actuator>

<!-- Robotiq gripper contact -->
Expand Down Expand Up @@ -307,8 +307,7 @@
</equality>

<actuator>
<general class="2f85" name="robotiq_85_left_knuckle_joint" tendon="split" forcerange="-5 5" ctrlrange="0 .8"
gainprm="100 0 0" biasprm="0 -100 -150"/>
<position class="2f85" name="robotiq_85_left_knuckle_joint" tendon="split" forcerange="-5 5" ctrlrange="0 .8" kp="100" kv="100"/>
</actuator>

<sensor>
Expand Down

0 comments on commit ccc2a99

Please sign in to comment.