bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Show the appropriate pause message (#12348)

Browse Source
This commit is contained in:
Scott Lahteine
2018-11-06 04:13:48 -06:00
committed by GitHub
parent 8517d5f915
commit 4c5ca89d8c
7 changed files with 180 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/gcode/feature/pause/M125.cpp
View File

@ -71,8 +71,8 @@ void GcodeSuite::M125() {
const bool job_running = print_job_timer.isRunning();
if (pause_print(retract, park_point) && !IS_SD_PRINTING()) {
wait_for_filament_reload(); // Wait for lcd click or M108
resume_print(); // Return to print position and continue
wait_for_confirmation(); // Wait for lcd click or M108
resume_print(); // Return to print position and continue
}
if (job_running) print_job_timer.start();

2
Marlin/src/gcode/feature/pause/M600.cpp
View File

@ -131,7 +131,7 @@ void GcodeSuite::M600() {
const bool job_running = print_job_timer.isRunning();
if (pause_print(retract, park_point, unload_length, true DXC_PASS)) {
wait_for_filament_reload(beep_count DXC_PASS);
wait_for_confirmation(true, beep_count DXC_PASS);
resume_print(slow_load_length, fast_load_length, ADVANCED_PAUSE_PURGE_LENGTH, beep_count DXC_PASS);
}