Skip to content

Rename torque_command to direct_torque #362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: torque_control
Choose a base branch
from
Open

Rename torque_command to direct_torque #362

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions resources/external_control.urscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +272,9 @@ thread torqueThread():
torque = cmd_torque
{% if ROBOT_SOFTWARE_VERSION >= v5.22.0 %} # ToDo: Increase to 5.23.0 once released
{% if ROBOT_SOFTWARE_VERSION < v6.0.0 %}
torque_command(torque, friction_comp=friction_compensation_enabled)
direct_torque(torque, friction_comp=friction_compensation_enabled)
{% elif ROBOT_SOFTWARE_VERSION >= v10.10.0 %}
torque_command(torque, friction_comp=friction_compensation_enabled)
direct_torque(torque, friction_comp=friction_compensation_enabled)
{% else %}
popup("Torque control is only supported from software 10.10.0 and upwards.", error=True, blocking=True)
{% endif %}
Expand Down Expand Up @@ -692,11 +692,11 @@ thread PDControlThread():
{% if ROBOT_SOFTWARE_VERSION < v6.0.0 %}
local tau = pd_controller_gains.kp * q_err - pd_controller_gains.kd * get_actual_joint_speeds()
tau = clamp_array(tau, max_joint_torques)
torque_command(tau, friction_comp=friction_compensation_enabled)
direct_torque(tau, friction_comp=friction_compensation_enabled)
{% elif ROBOT_SOFTWARE_VERSION >= v10.10.0 %}
local tau = pd_controller_gains.kp * q_err - pd_controller_gains.kd * get_actual_joint_speeds()
tau = clamp_array(tau, max_joint_torques)
torque_command(tau, friction_comp=friction_compensation_enabled)
direct_torque(tau, friction_comp=friction_compensation_enabled)
{% else %}
popup("Torque control is only supported from software 10.10.0 and upwards.", error=True, blocking=True)
{% endif %}
Expand Down
Loading