From c68f56e6e04298f2b1f08895039c458e50b751d8 Mon Sep 17 00:00:00 2001 From: Rob Giseburt Date: Tue, 19 Nov 2019 13:01:28 -0600 Subject: [PATCH] Prevent feedhold from progressing while dwell/spindle spin-up is in progress --- g2core/cycle_feedhold.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/g2core/cycle_feedhold.cpp b/g2core/cycle_feedhold.cpp index 238946d4..0db01a62 100644 --- a/g2core/cycle_feedhold.cpp +++ b/g2core/cycle_feedhold.cpp @@ -761,7 +761,7 @@ stat_t _feedhold_with_actions() // Execute Case (5) if (cm1.hold_state == FEEDHOLD_OFF) { cm1.hold_type = FEEDHOLD_TYPE_ACTIONS; // cm1.hold_exit = FEEDHOLD_EXIT_STOP; // default exit for ACTIONS is STOP... - if (cm1.motion_state == MOTION_STOP) { // if motion has already stopped declare that you are in a feedhold + if (mp_runtime_is_idle()) { // if motion has already stopped declare that you are in a feedhold _check_motion_stopped(); cm1.hold_state = FEEDHOLD_HOLD; cm1.hold_type = FEEDHOLD_TYPE_HOLD; // no actions will be performed, don't try to undo them