Skip to content

Commit 93891bb

Browse files
author
odippel@ypsilon.net
committed
fixing iocontrol_data.user_request_enable
1 parent ce5b8bd commit 93891bb

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

src/emc/task/taskclass.cc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -648,12 +648,13 @@ int Task::read_tool_inputs(void)
648648
void Task::run(){ // called periodically from emctaskmain.cc
649649
tool_status = read_tool_inputs();
650650

651-
if (iocontrol_data.emc_enable_in == 1 && iocontrol_data.user_request_enable == 1) {
652-
iocontrol_data.user_request_enable = 0;
653-
}
654651

655652
if (iocontrol_data.emc_enable_in == 0) //check for estop from HW
656653
emcioStatus.aux.estop = 1;
657-
else
654+
else {
658655
emcioStatus.aux.estop = 0;
656+
if (iocontrol_data.user_request_enable == 1) {
657+
iocontrol_data.user_request_enable = 0;
658+
}
659+
}
659660
}

0 commit comments

Comments
 (0)