Skip to content

Commit 43b4320

Browse files
committed
Fix order reading acc and vel from trajectory point interface
1 parent 205cabd commit 43b4320

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

resources/external_control.urscript

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -487,8 +487,8 @@ thread trajectoryThread():
487487
end
488488
# MoveJ point
489489
if raw_point[INDEX_POINT_TYPE] == TRAJECTORY_POINT_JOINT:
490-
acceleration = raw_point[7] / MULT_jointstate
491-
velocity = raw_point[13] / MULT_jointstate
490+
acceleration = raw_point[13] / MULT_jointstate
491+
velocity = raw_point[7] / MULT_jointstate
492492
movej(q, a = acceleration, v = velocity, t = tmptime, r = blend_radius)
493493

494494
# reset old acceleration
@@ -497,8 +497,8 @@ thread trajectoryThread():
497497

498498
# Movel point
499499
elif raw_point[INDEX_POINT_TYPE] == TRAJECTORY_POINT_CARTESIAN:
500-
acceleration = raw_point[7] / MULT_jointstate
501-
velocity = raw_point[13] / MULT_jointstate
500+
acceleration = raw_point[13] / MULT_jointstate
501+
velocity = raw_point[7] / MULT_jointstate
502502
movel(p[q[0], q[1], q[2], q[3], q[4], q[5]], a = acceleration, v = velocity, t = tmptime, r = blend_radius)
503503

504504
# reset old acceleration

0 commit comments

Comments
 (0)