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

Fix case where hold buffer with remainder of move was not being forward planned (plan_exec.cpp line 1045); Added additional checks to prevent feedhold from being initiated during non-motion cycles. Still needs special handling for corner cases - to be described in header comments in cycle_feedhold.cpp

Browse Source
This commit is contained in:
Alden Hart
2017-04-11 09:46:59 -04:00
parent 8eb99f2513
commit 1c6f81f857
5 changed files with 104 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
g2core/controller.cpp
+1 -2
View File
@@ -258,8 +258,7 @@ static void _dispatch_kernel(const devflags_t flags)
}
// trap single character commands
// if (*cs.bufp == '!') { cm_request_feedhold(FEEDHOLD_TYPE_ACTIONS, FEEDHOLD_EXIT_CYCLE); }
if (*cs.bufp == '!') { cm_request_feedhold(FEEDHOLD_TYPE_HOLD, FEEDHOLD_EXIT_CYCLE); }
if (*cs.bufp == '!') { cm_request_feedhold(FEEDHOLD_TYPE_ACTIONS, FEEDHOLD_EXIT_CYCLE); }
else if (*cs.bufp == '~') { cm_request_cycle_start(); }
else if (*cs.bufp == '%') { cm_request_queue_flush(); xio_flush_to_command(); }
else if (*cs.bufp == EOT) { cm_request_job_kill(); xio_flush_to_command(); }