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

Allow resume from pause with parking enabled (#12893)

Browse Source 
Currently, Pause of an SD-Memory card print does not work.    This has been verified to resolve the issue by multiple people.   

I understand more work needs to be done to resolve some of the concerns...
This commit is contained in:
InsanityAutomation
2019-01-15 09:58:54 -05:00
committed by Roxy-3D
parent 85f149befe
commit 59b18aaeef
3 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,10 @@
#include "../../../sd/cardreader.h"
#include "../../../module/printcounter.h"
#if HAS_LCD_MENU
#include "../../../lcd/ultralcd.h"
#endif
/**
* M125: Store current position and move to filament change position.
* Called on pause (by M25) to prevent material leaking onto the
@ -74,12 +78,17 @@ void GcodeSuite::M125() {
constexpr bool sd_printing = false;
#endif
if (pause_print(retract, park_point)) {
// SD Printing simply pauses, leaving the machine in a ready state,
// and can be resumed at any time, so don't wait in a loop here.
if (!sd_printing) {
wait_for_confirmation();
resume_print();
#if HAS_LCD_MENU
const bool show_lcd = parser.seenval('P');
lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_INIT, ADVANCED_PAUSE_MODE_PAUSE_PRINT, active_extruder);
#else
constexpr bool show_lcd = false;
#endif
if (pause_print(retract, park_point, 0, show_lcd)) {
if (!sd_printing || show_lcd ) {
wait_for_confirmation(false, 0);
resume_print(0, 0, PAUSE_PARK_RETRACT_LENGTH, 0);
}
}
}