Skip to content

Commit 115cf48

Browse files
urfeexmergify[bot]
authored andcommitted
Update feature list (#1372)
* Update feature list * Add references to feature list (cherry picked from commit c8a44a6) # Conflicts: # ur_robot_driver/doc/features.rst
1 parent f1b93a9 commit 115cf48

File tree

2 files changed

+25
-5
lines changed

2 files changed

+25
-5
lines changed

ur_calibration/doc/index.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11

2+
.. _ur_calibration:
3+
24
ur_calibration
35
==============
46

ur_robot_driver/doc/features.rst

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,19 @@ Feature list and roadmap
1313
* - joint-position-based control
1414
- yes
1515
* - scaled joint-position-based control
16-
- yes
16+
- yes (:ref:`scaled_jtc`)
1717
* - joint-velocity-based control
1818
- yes\ :raw-html-m2r:`<sup>1</sup>`
1919
* - Cartesian position-based control
2020
- no
2121
* - Cartesian twist-based control
2222
- no
2323
* - Trajectory forwarding for execution on robot
24+
<<<<<<< HEAD
2425
- no
26+
=======
27+
- yes (:ref:`passthrough_trajectory_controller`)
28+
>>>>>>> c8a44a6 (Update feature list (#1372))
2529
* - reporting of tcp wrench
2630
- yes
2731
* - pausing of programs
@@ -33,9 +37,9 @@ Feature list and roadmap
3337
* - panel interaction in between possible
3438
- yes
3539
* - get and set IO states
36-
- yes
40+
- yes (:ref:`io_and_status_controller`)
3741
* - use `tool communication forwarder <https://github.com/UniversalRobots/Universal_Robots_ToolComm_Forwarder_URCap>`_ on e-series
38-
- yes
42+
- yes (:ref:`setup-tool-communication`)
3943
* - use the driver without a teach pendant necessary
4044
- yes
4145
* - support of CB1 and CB2 robots
@@ -45,13 +49,27 @@ Feature list and roadmap
4549
* - use ROS as drop-in for TP-programs
4650
- yes
4751
* - headless mode
48-
- yes
52+
- yes (:ref:`headless_mode`)
4953
* - extract calibration from robot
50-
- yes
54+
- yes (:ref:`ur_calibration`)
5155
* - send custom script commands to robot
56+
<<<<<<< HEAD
5257
- no
5358
* - Reconnect on a disconnected robot
5459
- yes
5560

5661

5762
:raw-html-m2r:`<sup>1</sup>` Velocity-based joint control is implemented in the driver, but the current version of ros2_control do not yet support Velocity-based joint trajectory control
63+
=======
64+
- yes (:ref:`io_and_status_controller`)
65+
* - Reconnect on a disconnected robot
66+
- yes
67+
* - Freedrive Mode
68+
- yes (:ref:`freedrive_mode_controller`)
69+
* - Tool Contact mode
70+
- yes (:ref:`tool_contact_controller`)
71+
* - Force Mode
72+
- yes (:ref:`force_mode_controller`)
73+
74+
:raw-html-m2r:`<sup>1</sup>` Velocity-based joint control is implemented in the driver, the velocity-based joint trajectory controller would need tweaking of the gain parameters for each model.
75+
>>>>>>> c8a44a6 (Update feature list (#1372))

0 commit comments

Comments
 (0)