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

Adjust FEEDHOLD_TYPE_SCRAM to FEEDHOLD_TYPE_SKIP

Browse Source
This commit is contained in:
Rob Giseburt
2019-11-07 12:00:06 -05:00
parent caa429e17a
commit 6cb4ea5bfa
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
g2core/alarm.cpp
View File

@@ -175,7 +175,7 @@ stat_t cm_alarm(const stat_t status, const char *msg)
(cm->machine_state == MACHINE_PANIC)) {
return (STAT_OK); // don't alarm if already in an alarm state
}
cm_request_feedhold(FEEDHOLD_TYPE_SCRAM, FEEDHOLD_EXIT_ALARM); // fast stop and alarm
cm_request_feedhold(FEEDHOLD_TYPE_SKIP, FEEDHOLD_EXIT_ALARM); // fast stop and alarm
rpt_exception(status, msg); // send alarm message
sr_request_status_report(SR_REQUEST_TIMED);
return (status);
@@ -203,7 +203,7 @@ stat_t cm_shutdown(const stat_t status, const char *msg)
if ((cm->machine_state == MACHINE_SHUTDOWN) || (cm->machine_state == MACHINE_PANIC)) {
return (STAT_OK); // don't shutdown if shutdown or panic'd
}
cm_request_feedhold(FEEDHOLD_TYPE_SCRAM, FEEDHOLD_EXIT_SHUTDOWN); // fast stop and shutdown
cm_request_feedhold(FEEDHOLD_TYPE_SKIP, FEEDHOLD_EXIT_SHUTDOWN); // fast stop and shutdown
// spindle_reset(); // stop spindle immediately and set speed to 0 RPM
// coolant_reset(); // stop coolant immediately

2
g2core/cycle_feedhold.cpp
View File

@@ -564,7 +564,7 @@ void cm_request_feedhold(cmFeedholdType type, cmFeedholdExit exit)
switch (cm1.hold_type) {
case FEEDHOLD_TYPE_HOLD: { op.add_action(_feedhold_no_actions); break; }
case FEEDHOLD_TYPE_ACTIONS: { op.add_action(_feedhold_with_actions); break; }
case FEEDHOLD_TYPE_SCRAM:
// case FEEDHOLD_TYPE_SCRAM: <- no longer used, use FEEDHOLD_TYPE_SKIP instead
case FEEDHOLD_TYPE_SKIP: { op.add_action(_feedhold_skip); break; }
default: {}
}