We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 4eaf89c commit ce5b8bdCopy full SHA for ce5b8bd
1 file changed
src/emc/task/taskclass.cc
@@ -375,6 +375,7 @@ int Task::emcAuxEstopOn()//EMC_AUX_ESTOP_ON_TYPE
375
{
376
/* assert an ESTOP to the outside world (thru HAL) */
377
iocontrol_data.user_enable_out = 0; //disable on ESTOP_ON
378
+ iocontrol_data.user_request_enable = 0;
379
hal_init_pins(); //resets all HAL pins to safe valuea
380
return 0;
381
}
@@ -646,6 +647,11 @@ int Task::read_tool_inputs(void)
646
647
648
void Task::run(){ // called periodically from emctaskmain.cc
649
tool_status = read_tool_inputs();
650
+
651
+ if (iocontrol_data.emc_enable_in == 1 && iocontrol_data.user_request_enable == 1) {
652
653
+ }
654
655
if (iocontrol_data.emc_enable_in == 0) //check for estop from HW
656
emcioStatus.aux.estop = 1;
657
else
0 commit comments