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

Fix pause/resume SD print

Browse Source 
Followup to #12551, addressing #12566
This commit is contained in:
Scott Lahteine
2018-11-30 19:22:56 -06:00
parent 2224a4d61a
commit 261c6f4b96
6 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,12 +68,13 @@ void GcodeSuite::M125() {
park_point.y += (active_extruder ? hotend_offset[Y_AXIS][active_extruder] : 0);
#endif
#if ENABLED(SDSUPPORT)
const bool sd_printing = IS_SD_PRINTING();
#else
constexpr bool sd_printing = false;
#endif
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();

19
Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp
View File

@ -91,17 +91,11 @@ void GcodeSuite::M24() {
#if ENABLED(POWER_LOSS_RECOVERY)
if (parser.seenval('S')) card.setIndex(parser.value_long());
if (parser.seenval('T')) print_job_timer.resume(parser.value_long());
#endif
card.startFileprint();
#if ENABLED(POWER_LOSS_RECOVERY)
if (parser.seenval('T'))
print_job_timer.resume(parser.value_long());
else
#endif
print_job_timer.start();
print_job_timer.start();
ui.reset_status();
}
@ -109,11 +103,12 @@ void GcodeSuite::M24() {
* M25: Pause SD Print
*/
void GcodeSuite::M25() {
card.pauseSDPrint();
print_job_timer.pause();
#if ENABLED(PARK_HEAD_ON_PAUSE)
enqueue_and_echo_commands_P(PSTR("M125 S")); // To be last in the buffer, must enqueue after pauseSDPrint
M125();
#else
card.pauseSDPrint();
print_job_timer.pause();
ui.reset_status();
#endif
}