From ea94716a87885653ae88d2ba92c6cccb22286f12 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 6 Jul 2020 19:28:25 -0500 Subject: [PATCH] Combine command macros --- .../lcd/extui/lib/mks_ui/printer_opration.cpp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/Marlin/src/lcd/extui/lib/mks_ui/printer_opration.cpp b/Marlin/src/lcd/extui/lib/mks_ui/printer_opration.cpp index ac876bb16..49413a9b1 100644 --- a/Marlin/src/lcd/extui/lib/mks_ui/printer_opration.cpp +++ b/Marlin/src/lcd/extui/lib/mks_ui/printer_opration.cpp @@ -51,10 +51,7 @@ if (uiCfg.waitEndMoves > 20) { uiCfg.waitEndMoves = 0; planner.synchronize(); - gcode.process_subcommands_now_P(PSTR("M25")); - gcode.process_subcommands_now_P(PSTR("G91")); - gcode.process_subcommands_now_P(PSTR("G1 Z5")); - gcode.process_subcommands_now_P(PSTR("G90")); + gcode.process_subcommands_now_P(PSTR("M25\nG91\nG1 Z5\nG90")); uiCfg.print_state = PAUSED; @@ -76,10 +73,7 @@ if (uiCfg.print_state == RESUMING) { if (IS_SD_PAUSED()) { - gcode.process_subcommands_now_P(PSTR("G91")); - gcode.process_subcommands_now_P(PSTR("G1 Z-5")); - gcode.process_subcommands_now_P(PSTR("G90")); - gcode.process_subcommands_now_P(PSTR("M24")); + gcode.process_subcommands_now_P(PSTR("G91\nG1 Z-5\nG90\nM24")); uiCfg.print_state = WORKING; start_print_time(); @@ -104,11 +98,8 @@ } #endif - if (gCfgItems.pause_reprint == 1) { - gcode.process_subcommands_now_P(PSTR("G91")); - gcode.process_subcommands_now_P(PSTR("G1 Z-5")); - gcode.process_subcommands_now_P(PSTR("G90")); - } + if (gCfgItems.pause_reprint == 1) + gcode.process_subcommands_now_P(PSTR("G91\nG1 Z-5\nG90")); recovery.resume(); uiCfg.print_state = WORKING;