@@ -242,13 +242,19 @@ def ClearTrajectoryStatus(manipulator):
242
242
if not manipulator .simulated :
243
243
manipulator .controller .SendCommand ('ClearStatus' )
244
244
245
- def MoveUntilTouch (manipulator , direction , distance , max_distance = float ( '+inf' ) ,
245
+ def MoveUntilTouch (manipulator , direction , distance , max_distance = 2. ,
246
246
max_force = 5.0 , max_torque = None , ignore_collisions = None , ** kw_args ):
247
247
"""Execute a straight move-until-touch action.
248
248
This action stops when a sufficient force is is felt or the manipulator
249
249
moves the maximum distance. The motion is considered successful if the
250
250
end-effector moves at least distance. In simulation, a move-until-touch
251
251
action proceeds until the end-effector collids with the environment.
252
+
253
+ The maximum distance defaults to a value that is higher than the size
254
+ of the reachable workspace of the WAM, which is roughly a sphere with a
255
+ radius of one meter. This means that, by default, the arm will move as
256
+ far as possible while obeying the straight-line constraint.
257
+
252
258
@param direction unit vector for the direction of motion in the world frame
253
259
@param distance minimum distance in meters
254
260
@param max_distance maximum distance in meters
@@ -258,6 +264,7 @@ def MoveUntilTouch(manipulator, direction, distance, max_distance=float('+inf'),
258
264
@param **kw_args planner parameters
259
265
@return felt_force flag indicating whether we felt a force.
260
266
"""
267
+
261
268
# TODO: Is ignore_collisions a list of names or KinBody pointers?
262
269
if max_torque is None :
263
270
max_torque = numpy .array ([100.0 , 100.0 , 100.0 ])
0 commit comments