Skip to content

Commit ce5b8bd

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

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

src/emc/task/taskclass.cc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@ int Task::emcAuxEstopOn()//EMC_AUX_ESTOP_ON_TYPE
375375
{
376376
/* assert an ESTOP to the outside world (thru HAL) */
377377
iocontrol_data.user_enable_out = 0; //disable on ESTOP_ON
378+
iocontrol_data.user_request_enable = 0;
378379
hal_init_pins(); //resets all HAL pins to safe valuea
379380
return 0;
380381
}
@@ -646,6 +647,11 @@ int Task::read_tool_inputs(void)
646647

647648
void Task::run(){ // called periodically from emctaskmain.cc
648649
tool_status = read_tool_inputs();
650+
651+
if (iocontrol_data.emc_enable_in == 1 && iocontrol_data.user_request_enable == 1) {
652+
iocontrol_data.user_request_enable = 0;
653+
}
654+
649655
if (iocontrol_data.emc_enable_in == 0) //check for estop from HW
650656
emcioStatus.aux.estop = 1;
651657
else

0 commit comments

Comments
 (0)