ManuelW/grbl-LPC-CoreXY
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

M30 minor bug fix.

Browse Source 
Order of operations was off. Now works as intended,
This commit is contained in:
Sonny Jeon 2012-09-19 20:50:24 -06:00
parent 1720484d76
commit 4d3c720bcc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcode.c
View File

@ -529,10 +529,11 @@ uint8_t gc_execute_line(char *line)
if (gc.program_flow) { if (gc.program_flow) {
plan_synchronize(); // Finish all remaining buffered motions. Program paused when complete. plan_synchronize(); // Finish all remaining buffered motions. Program paused when complete.
sys.auto_start = false; // Disable auto cycle start. sys.auto_start = false; // Disable auto cycle start.
gc.program_flow = PROGRAM_FLOW_RUNNING; // Re-enable program flow after pause complete.
// If complete, reset to reload defaults (G92.2,G54,G17,G90,G94,M48,G40,M5,M9) // If complete, reset to reload defaults (G92.2,G54,G17,G90,G94,M48,G40,M5,M9). Otherwise,
// re-enable program flow after pause complete, where cycle start will resume the program.
if (gc.program_flow == PROGRAM_FLOW_COMPLETED) { sys.abort = true; } if (gc.program_flow == PROGRAM_FLOW_COMPLETED) { sys.abort = true; }
else { gc.program_flow = PROGRAM_FLOW_RUNNING; }
} }
return(gc.status_code); return(gc.status_code);