andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Combine command macros

vanilla_fb_2.0.x
Scott Lahteine 4 years ago
parent
d6682c8609
commit
ea94716a87
1 changed files with 4 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      Marlin/src/lcd/extui/lib/mks_ui/printer_opration.cpp

17
Marlin/src/lcd/extui/lib/mks_ui/printer_opration.cpp
View File

@ -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 @@
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 @@
} }
#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;

Write Preview
Loading…
Cancel
Save