Fix "paused" message and M125 called by M25 (#12551)

This commit is contained in:
Scott Lahteine
2018-11-28 19:28:31 -06:00
committed by GitHub
parent 95d154a91f
commit 03ef2d6c82
8 changed files with 24 additions and 32 deletions

View File

@@ -68,15 +68,16 @@ void GcodeSuite::M125() {
park_point.y += (active_extruder ? hotend_offset[Y_AXIS][active_extruder] : 0);
#endif
const bool job_running = print_job_timer.isRunning(),
sd_printing = IS_SD_PRINTING();
if (pause_print(retract, park_point)) {
#if ENABLED(SDSUPPORT)
const bool sd_printing = IS_SD_PRINTING() || parser.boolval('S'); // Undocumented parameter
#else
constexpr bool sd_printing = false;
#endif
if (!sd_printing) {
wait_for_confirmation();
resume_print();
}
if (job_running) print_job_timer.start();
}
}