Skip to content

Commit bd79cec

Browse files
authored
Docs: Corrects forward hardware interfaces & Contributing.md (backport #1569) (#1570)
* Docs: Corrects forward controller docs - Fixes velocity & position controller docs - Adds "forward_effort_controller" * Docs: The main branch is "main" now
1 parent b046361 commit bd79cec

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Please try to include as much information as you can. Details like these are inc
2424
Contributions via pull requests are much appreciated.
2525
Before sending us a pull request, please ensure that:
2626

27-
1. You are working against the latest source on the *master* branch.
27+
1. You are working against the latest source on the *main* branch.
2828
2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
2929
3. You open an issue to discuss any significant work - we would hate for your time to be wasted.
3030

ur_robot_driver/doc/usage/controllers.rst

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,23 +97,25 @@ Type: :ref:`ur_controllers/GPIOController <io_and_status_controller>`
9797

9898
Allows setting I/O ports, controlling some UR-specific functionality and publishes status information about the robot.
9999

100+
forward_effort_controller
101+
^^^^^^^^^^^^^^^^^^^^^^^^^
102+
Type: `effort_controllers/JointGroupEffortController <https://control.ros.org/rolling/doc/ros2_controllers/effort_controllers/doc/userdoc.html#effort-controllers-jointgroupeffortcontroller>`_
103+
104+
Allows setting target joint efforts (torques) directly. The user is therefore responsible for sending commands that are achievable. This controller is useful when implementing compliance or force control strategies.
105+
100106
forward_velocity_controller
101107
^^^^^^^^^^^^^^^^^^^^^^^^^^^
102108

103109
Type: `velocity_controllers/JointGroupVelocityController <https://control.ros.org/rolling/doc/ros2_controllers/velocity_controllers/doc/userdoc.html#velocity-controllers-jointgroupvelocitycontroller>`_
104110

105-
Allows setting target joint positions directly. The robot tries to reach the target position as
106-
fast as possible. The user is therefore responsible for sending commands that are achievable. This
107-
controller is particularly useful when doing servoing such as ``moveit_servo``.
111+
Allows setting target joint velocities directly. The user is therefore responsible for sending commands that are achievable. This controller is particularly useful when doing servoing such as ``moveit_servo``.
108112

109113
forward_position_controller
110114
^^^^^^^^^^^^^^^^^^^^^^^^^^^
111115

112116
Type: `position_controllers/JointGroupPositionController <https://control.ros.org/rolling/doc/ros2_controllers/position_controllers/doc/userdoc.html#position-controllers-jointgrouppositioncontroller>`_
113117

114-
Allows setting target joint velocities directly. The user is responsible for sending commands that
115-
are achievable. This controller is particularly useful when doing servoing such as
116-
``moveit_servo``.
118+
Allows setting target joint positions directly. The robot tries to reach the target position as fast as possible. The user is responsible for sending commands that are achievable. This controller is particularly useful when doing servoing such as ``moveit_servo``.
117119

118120
force_mode_controller
119121
^^^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)