Skip to content

Commit 6704f2e

Browse files
author
Felix Exner
committed
Update wording
1 parent c01733c commit 6704f2e

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

ur_moveit_config/doc/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ robot as explained `here <https://moveit.picknik.ai/main/doc/tutorials/quickstar
2727
.. note::
2828
Usually, MoveIt uses trajectory execution monitoring (TEM). If executing a trajectory takes too long,
2929
e.g. because the action server died or the robot is blocked, this will lead to an error in
30-
trajectory execution. However, with the scaled joint trajectory controller offered by this driver,
31-
this doesn't make much sense (as long as TEM is not aware of the scaling), as execution time can
30+
trajectory execution. However, this isn't necessarily compatible with the scaled joint
31+
trajectory controller (as long as TEM is not aware of the scaling), as execution time can
3232
be unbounded on purpose. Hence, TEM is disabled in the example MoveIt configuration:
3333

3434
.. literalinclude:: ../config/moveit_controllers.yaml

ur_robot_driver/doc/usage/move.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ robot as explained `here <https://moveit.picknik.ai/main/doc/tutorials/quickstar
7070
.. note::
7171
Usually, MoveIt uses trajectory execution monitoring (TEM). If executing a trajectory takes too long,
7272
e.g. because the action server died or the robot is blocked, this will lead to an error in
73-
trajectory execution. However, with the scaled joint trajectory controller used by this driver,
74-
this doesn't make much sense (as long as TEM is not aware of the scaling), as execution time can
75-
be unbounded on purpose. Hence, TEM is disabled in the example moveit configuration.
73+
trajectory execution. However, this isn't necessarily compatible with the scaled joint
74+
trajectory controller (as long as TEM is not aware of the scaling), as execution time can
75+
be unbounded on purpose. Hence, TEM is disabled in the example MoveIt configuration.
7676

7777
For more details, please see :ref:`ur_moveit_config`.

0 commit comments

Comments
 (0)