Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-09-24 05:53:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adjust interlock hold handling with ENABLE_INTERLOCK_AND_ESTOP

Browse Source
This commit is contained in:
Rob Giseburt
2020-01-10 19:25:11 -06:00
parent 853e468ed6
commit 05fadbcdb6
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
g2core/cycle_feedhold.cpp
+15 -1
View File
@@ -332,6 +332,20 @@ static stat_t _run_shutdown() {
cm1.hold_exit = FEEDHOLD_EXIT_END;
return (STAT_OK);
}
#ifdef ENABLE_INTERLOCK_AND_ESTOP
static stat_t _run_interlock_started() {
cm1.machine_state = MACHINE_INTERLOCK;
return (STAT_OK);
}
static stat_t _run_interlock_ended() {
if (cm1.cycle_type != CYCLE_NONE) {
cm1.machine_state = MACHINE_CYCLE;
} else {
cm1.machine_state = MACHINE_PROGRAM_END;
}
return (_run_restart_cycle());
}
#else
static stat_t _run_interlock_started() {
cm1.safety_interlock_state = SAFETY_INTERLOCK_DISENGAGED;
cm1.machine_state = MACHINE_INTERLOCK;
@@ -346,7 +360,7 @@ static stat_t _run_interlock_ended() {
}
return (_run_restart_cycle());
}
#endif
/****************************************************************************************
* cm_request_cycle_start() - set request enum only
* _start_cycle_start() - run the cycle start