Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions config/arm/v10/control_gains.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,7 @@ joint6:
joint7:
kp: 10.0
kd: 0.5

hand:
kp: 5.0
kd: 0.1
8 changes: 8 additions & 0 deletions urdf/ros2_control/openarm.bimanual.ros2_control.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@
<param name="kd5">${control_gains['joint5']['kd']}</param>
<param name="kd6">${control_gains['joint6']['kd']}</param>
<param name="kd7">${control_gains['joint7']['kd']}</param>
<xacro:if value="${hand}">
<param name="kp_hand">${control_gains['hand']['kp']}</param>
<param name="kd_hand">${control_gains['hand']['kd']}</param>
</xacro:if>
</xacro:unless>
</hardware>

Expand Down Expand Up @@ -107,6 +111,10 @@
<param name="kd5">${control_gains['joint5']['kd']}</param>
<param name="kd6">${control_gains['joint6']['kd']}</param>
<param name="kd7">${control_gains['joint7']['kd']}</param>
<xacro:if value="${hand}">
<param name="kp_hand">${control_gains['hand']['kp']}</param>
<param name="kd_hand">${control_gains['hand']['kd']}</param>
</xacro:if>
</xacro:unless>
</hardware>

Expand Down
4 changes: 4 additions & 0 deletions urdf/ros2_control/openarm.ros2_control.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@
<param name="kd5">${control_gains['joint5']['kd']}</param>
<param name="kd6">${control_gains['joint6']['kd']}</param>
<param name="kd7">${control_gains['joint7']['kd']}</param>
<xacro:if value="${hand}">
<param name="kp_hand">${control_gains['hand']['kp']}</param>
<param name="kd_hand">${control_gains['hand']['kd']}</param>
</xacro:if>
</xacro:if>
</hardware>

Expand Down