Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-09-28 16:11:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix interlock state handling

Browse Source
This commit is contained in:
Rob Giseburt
2020-01-10 19:25:10 -06:00
parent a99a2430c3
commit b1b42bdf4e
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
g2core/cycle_feedhold.cpp
+6 -1
View File
@@ -334,11 +334,16 @@ static stat_t _run_shutdown() {
}
static stat_t _run_interlock_started() {
cm1.safety_interlock_state = SAFETY_INTERLOCK_DISENGAGED;
// cm->machine_state = MACHINE_INTERLOCK;
cm1.machine_state = MACHINE_INTERLOCK;
return (STAT_OK);
}
static stat_t _run_interlock_ended() {
cm1.safety_interlock_state = SAFETY_INTERLOCK_ENGAGED;
if (cm1.cycle_type != CYCLE_NONE) {
cm1.machine_state = MACHINE_CYCLE;
} else {
cm1.machine_state = MACHINE_PROGRAM_END;
}
return (_run_restart_cycle());
}