Skip to content

Commit 034db2e

Browse files
authored
Merge pull request #4031 from grandixximo/fix/3675-tool-change-abort-wedge
task: unblock tool-change abort by setting io.status=DONE
2 parents 4a783a2 + 990cb29 commit 034db2e

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

src/emc/task/taskclass.cc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,9 @@ int Task::emcIoAbort(EMC_ABORT /*reason*/)//EMC_TOOL_ABORT_TYPE
369369
iocontrol_data.coolant_flood = 0; /* coolant flood output pin */
370370
iocontrol_data.tool_change = 0; /* abort tool change if in progress */
371371
iocontrol_data.tool_prepare = 0; /* abort tool prepare if in progress */
372+
// release task wait on pending tool-change/prepare (old NML iocontrol
373+
// returned RCS_DONE by default; in-process call must do it explicitly)
374+
emcioStatus.status = RCS_STATUS::DONE;
372375
return 0;
373376
}
374377

0 commit comments

Comments
 (0)