Browse Source

Combine command macros

Scott Lahteine 5 years ago
parent
commit
ea94716a87
1 changed files with 4 additions and 13 deletions
  1. 4
    13
      Marlin/src/lcd/extui/lib/mks_ui/printer_opration.cpp

+ 4
- 13
Marlin/src/lcd/extui/lib/mks_ui/printer_opration.cpp View File

@@ -51,10 +51,7 @@
51 51
         if (uiCfg.waitEndMoves > 20) {
52 52
           uiCfg.waitEndMoves = 0;
53 53
           planner.synchronize();
54
-          gcode.process_subcommands_now_P(PSTR("M25"));
55
-          gcode.process_subcommands_now_P(PSTR("G91"));
56
-          gcode.process_subcommands_now_P(PSTR("G1 Z5"));
57
-          gcode.process_subcommands_now_P(PSTR("G90"));
54
+          gcode.process_subcommands_now_P(PSTR("M25\nG91\nG1 Z5\nG90"));
58 55
 
59 56
           uiCfg.print_state = PAUSED;
60 57
 
@@ -76,10 +73,7 @@
76 73
 
77 74
     if (uiCfg.print_state == RESUMING) {
78 75
       if (IS_SD_PAUSED()) {
79
-        gcode.process_subcommands_now_P(PSTR("G91"));
80
-        gcode.process_subcommands_now_P(PSTR("G1 Z-5"));
81
-        gcode.process_subcommands_now_P(PSTR("G90"));
82
-        gcode.process_subcommands_now_P(PSTR("M24"));
76
+        gcode.process_subcommands_now_P(PSTR("G91\nG1 Z-5\nG90\nM24"));
83 77
         uiCfg.print_state = WORKING;
84 78
         start_print_time();
85 79
 
@@ -104,11 +98,8 @@
104 98
       }
105 99
       #endif
106 100
 
107
-      if (gCfgItems.pause_reprint == 1) {
108
-        gcode.process_subcommands_now_P(PSTR("G91"));
109
-        gcode.process_subcommands_now_P(PSTR("G1 Z-5"));
110
-        gcode.process_subcommands_now_P(PSTR("G90"));
111
-      }
101
+      if (gCfgItems.pause_reprint == 1)
102
+        gcode.process_subcommands_now_P(PSTR("G91\nG1 Z-5\nG90"));
112 103
       recovery.resume();
113 104
 
114 105
       uiCfg.print_state = WORKING;

Loading…
Cancel
Save