Skip to content

Commit

Permalink
Merge branch 'master' into devel
Browse files Browse the repository at this point in the history
  • Loading branch information
@pattacini
pattacini committed Oct 1, 2024
2 parents 5081ba1 + b0bb645 commit 73c86c8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
6 changes: 2 additions & 4 deletions iCubGenova11/hardware/motorControl/left_arm-eb24-j4_7-mc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<!-- joint number 0 1 2 3 -->
<!-- joint name "l_wrist_prosup" "l_wrist_pitch" "l_wrist_yaw" "l_hand_finger" -->
<group name="LIMITS">
<param name="jntPosMax"> 60 25 35 60 </param>
<param name="jntPosMin"> -60 -70 -15 10 </param>
<param name="jntPosMax"> 85 25 35 60 </param>
<param name="jntPosMin"> -85 -70 -15 10 </param>
<param name="jntVelMax"> 1000 1000 1000 1000 </param>
<param name="motorOverloadCurrents"> 10000 2000 2000 2000 </param>
<param name="motorNominalCurrents"> 5000 1000 1000 600 </param>
Expand Down Expand Up @@ -92,5 +92,3 @@
<!-- custom PIDs: end -->

</device>


6 changes: 2 additions & 4 deletions iCubGenova11/hardware/motorControl/right_arm-eb27-j4_7-mc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<!-- joint number 0 1 2 3 -->
<!-- joint name "r_wrist_prosup" "r_wrist_pitch" "r_wrist_yaw" "r_hand_finger" -->
<group name="LIMITS">
<param name="jntPosMax"> 60 25 35 60 </param>
<param name="jntPosMin"> -60 -70 -15 10 </param>
<param name="jntPosMax"> 85 25 35 60 </param>
<param name="jntPosMin"> -85 -70 -15 10 </param>
<param name="jntVelMax"> 1000 1000 1000 1000 </param>
<param name="motorOverloadCurrents"> 10000 2000 2000 2000 </param>
<param name="motorNominalCurrents"> 5000 1000 1000 600 </param>
Expand Down Expand Up @@ -92,5 +92,3 @@
<!-- custom PIDs: end -->

</device>


0 comments on commit 73c86c8

Please sign in to comment.