Skip to content

Commit 41f0f16

Browse files
committed
Send trajectory result CANCELED only when trajectory is running
1 parent d24f8f9 commit 41f0f16

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

resources/external_control.urscript

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -698,9 +698,11 @@ while control_mode > MODE_STOPPED:
698698
# Clear remaining trajectory points
699699
if control_mode == MODE_FORWARD:
700700
kill thread_trajectory
701-
clear_remaining_trajectory_points()
702-
stopj(STOPJ_ACCELERATION)
703-
socket_send_int(TRAJECTORY_RESULT_CANCELED, "trajectory_socket")
701+
if trajectory_points_left > 0:
702+
clear_remaining_trajectory_points()
703+
stopj(STOPJ_ACCELERATION)
704+
socket_send_int(TRAJECTORY_RESULT_CANCELED, "trajectory_socket")
705+
end
704706
# Stop freedrive
705707
elif control_mode == MODE_FREEDRIVE:
706708
textmsg("Leaving freedrive mode")

0 commit comments

Comments
 (0)