You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: ur_robot_driver/README.md
+18-2Lines changed: 18 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -4,8 +4,11 @@ This package contains the actual driver for UR robots. It is part of the *univer
4
4
repository and requires other packages from that repository. Also, see the [main repository's
5
5
README](../README.md) for information on how to install and startup this driver.
6
6
7
+
<<<<<<< HEAD
7
8
## ROS-API
8
9
The ROS API is documented in a [standalone document](doc/ROS_INTERFACE.md).
10
+
=======
11
+
>>>>>>> d38be8e ([CI] Check links using lychee instead of a custom script (#1355))
9
12
10
13
## Technical details
11
14
The following image shows a very coarse overview of the driver's architecture.
@@ -41,7 +44,11 @@ The robot won't accept script code from a remote source unless the robot is put
41
44
*remote_control-mode*. However, if put into *remote_control-mode*, the program containing the
42
45
**External Control** program node can't be started from the panel.
43
46
For this purpose, please use the **dashboard** services to load, start and stop the main program
47
+
<<<<<<< HEAD
44
48
running on the robot. See the [ROS-API documentation](doc/ROS_INTERFACE.md) for details on the
49
+
=======
50
+
running on the robot. See the [Dashboard client documentation](doc/dashboard_client.rst) for details on the
51
+
>>>>>>> d38be8e ([CI] Check links using lychee instead of a custom script (#1355))
45
52
dashboard services.
46
53
47
54
For using the **tool communication interface** on e-Series robots, a `socat` script is prepared to
@@ -55,6 +62,7 @@ recommend using the controllers from the `ur_controllers` package. See it's
55
62
available using the controllers from `ur_controllers`**
56
63
57
64
## A note about modes
65
+
<<<<<<< HEAD
58
66
The term **mode** is used in different meanings inside this driver.
59
67
60
68
### Remote control mode
@@ -90,7 +98,15 @@ execution without the teach pendant. The **headless** mode might be removed in f
90
98
91
99
**Note for the e-Series:** In order to leverage the **headless** mode on the e-Series the robot must
92
100
be in **remote_control_mode** as explained above.
101
+
=======
102
+
The term **mode** is used in different meanings inside this driver. See [Operation
103
+
Modes](doc/operation_modes.rst) for details.
104
+
>>>>>>> d38be8e ([CI] Check links using lychee instead of a custom script (#1355))
93
105
94
106
## controller_stopper
95
-
A small helper node that stops and restarts ROS controllers based on a boolean status topic. When the status goes to `false`, all running controllers except a set of predefined *consistent_controllers* gets stopped. If status returns to `true` the stopped controllers are restarted.
96
-
This is done by Subscribing to a robot's running state topic. Ideally this topic is latched and only publishes on changes. However, this node only reacts on state changes, so a state published each cycle would also be fine.
107
+
A small helper node that stops and restarts ROS controllers based on a boolean status topic. When
108
+
the status goes to `false`, all running controllers except a set of predefined
109
+
*consistent_controllers* gets stopped. If status returns to `true` the stopped controllers are
110
+
restarted. This is done by Subscribing to a robot's running state topic. Ideally this topic is
111
+
latched and only publishes on changes. However, this node only reacts on state changes, so a state
0 commit comments