Skip to content

Commit 2eaffa6

Browse files
urmahpFelix Exner
authored andcommitted
Update descriptions based on suggestions
1 parent 22d402b commit 2eaffa6

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

include/ur_client_library/comm/control_mode.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ enum class ControlMode : int32_t
4848
MODE_POSE = 5, ///< Set when cartesian pose control is active.
4949
MODE_FREEDRIVE = 6, ///< Set when freedrive mode is active.
5050
MODE_TOOL_IN_CONTACT =
51-
7 ///< Used by the internally in the script, when robot is in tool contact, clear by endToolContact()
51+
7 ///< Used only internally in the script, when robot is in tool contact, clear by endToolContact()
5252
};
5353
} // namespace comm
5454
} // namespace urcl

include/ur_client_library/ur/ur_driver.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -277,18 +277,18 @@ class UrDriver
277277
* \param task_frame A pose vector that defines the force frame relative to the base frame
278278
* \param selection_vector A 6d vector of 0s and 1s. 1 means that the robot will be compliant in the corresponding
279279
* axis of the task frame
280-
* \param wrench The forces/torques the robot will apply to its environment. The robot adjusts its position
281-
* along/about compliant axis in order to achieve the specified force/torque. Values have no effect for non-compliant
282-
* axes
280+
* \param wrench 6d vector of forces/torques [x,y,z,rotX,rotY,rotZ] that the robot will apply to its environment. The
281+
* robot adjusts its position along/about compliant axis in order to achieve the specified force/torque. Values have
282+
* no effect for non-compliant axes.
283283
* \param type An integer [1;3] specifying how the robot interprets the force frame.
284284
* 1: The force frame is transformed in a way such that its y-axis is aligned with a vector pointing from the robot
285285
* tcp towards the origin of the force frame
286286
* 2: The force frame is not transformed
287287
* 3: The force frame is transformed in a way such that its x-axis is the projection of the robot tcp velocity vector
288288
* onto the x-y plane of the force frame
289-
* \param limits (Float) 6d vector. For compliant axes, these values are the maximum allowed tcp speed along/about the
290-
* axis. For non-compliant axes, these values are the maximum allowed deviation along/about an axis between the actual
291-
* tcp position and the one set by the program
289+
* \param limits (double) 6d vector. For compliant axes, these values are the maximum allowed tcp speed
290+
* along/about the axis. For non-compliant axes, these values are the maximum allowed deviation along/about an axis
291+
* between the actual tcp position and the one set by the program
292292
*
293293
* \returns True, if the write was performed successfully, false otherwise.
294294
*/

0 commit comments

Comments
 (0)