Skip to content
Snippets Groups Projects
Commit ea94716a authored by Scott Lahteine's avatar Scott Lahteine
Browse files

Combine command macros

parent d6682c86
Branches
Tags
No related merge requests found
...@@ -51,10 +51,7 @@ ...@@ -51,10 +51,7 @@
if (uiCfg.waitEndMoves > 20) { if (uiCfg.waitEndMoves > 20) {
uiCfg.waitEndMoves = 0; uiCfg.waitEndMoves = 0;
planner.synchronize(); planner.synchronize();
gcode.process_subcommands_now_P(PSTR("M25")); gcode.process_subcommands_now_P(PSTR("M25\nG91\nG1 Z5\nG90"));
gcode.process_subcommands_now_P(PSTR("G91"));
gcode.process_subcommands_now_P(PSTR("G1 Z5"));
gcode.process_subcommands_now_P(PSTR("G90"));
uiCfg.print_state = PAUSED; uiCfg.print_state = PAUSED;
...@@ -76,10 +73,7 @@ ...@@ -76,10 +73,7 @@
if (uiCfg.print_state == RESUMING) { if (uiCfg.print_state == RESUMING) {
if (IS_SD_PAUSED()) { if (IS_SD_PAUSED()) {
gcode.process_subcommands_now_P(PSTR("G91")); gcode.process_subcommands_now_P(PSTR("G91\nG1 Z-5\nG90\nM24"));
gcode.process_subcommands_now_P(PSTR("G1 Z-5"));
gcode.process_subcommands_now_P(PSTR("G90"));
gcode.process_subcommands_now_P(PSTR("M24"));
uiCfg.print_state = WORKING; uiCfg.print_state = WORKING;
start_print_time(); start_print_time();
...@@ -104,11 +98,8 @@ ...@@ -104,11 +98,8 @@
} }
#endif #endif
if (gCfgItems.pause_reprint == 1) { if (gCfgItems.pause_reprint == 1)
gcode.process_subcommands_now_P(PSTR("G91")); gcode.process_subcommands_now_P(PSTR("G91\nG1 Z-5\nG90"));
gcode.process_subcommands_now_P(PSTR("G1 Z-5"));
gcode.process_subcommands_now_P(PSTR("G90"));
}
recovery.resume(); recovery.resume();
uiCfg.print_state = WORKING; uiCfg.print_state = WORKING;
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment