Skip to content

Commit 82772ef

Browse files
committed
Send trajectory result CANCELED only when trajectory is running
1 parent 0086f9c commit 82772ef

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
@@ -690,9 +690,11 @@ while control_mode > MODE_STOPPED:
690690
# Clear remaining trajectory points
691691
if control_mode == MODE_FORWARD:
692692
kill thread_trajectory
693-
clear_remaining_trajectory_points()
694-
stopj(STOPJ_ACCELERATION)
695-
socket_send_int(TRAJECTORY_RESULT_CANCELED, "trajectory_socket")
693+
if trajectory_points_left > 0:
694+
clear_remaining_trajectory_points()
695+
stopj(STOPJ_ACCELERATION)
696+
socket_send_int(TRAJECTORY_RESULT_CANCELED, "trajectory_socket")
697+
end
696698
# Stop freedrive
697699
elif control_mode == MODE_FREEDRIVE:
698700
textmsg("Leaving freedrive mode")

0 commit comments

Comments
 (0)