Browse Source

Un-pause print on cancel (#9780)

pull/1/head
Scott Lahteine 7 years ago
committed by GitHub
parent
commit
e749945317
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      Marlin/src/lcd/malyanlcd.cpp
  2. 7
      Marlin/src/sd/cardreader.cpp

1
Marlin/src/lcd/malyanlcd.cpp

@ -228,6 +228,7 @@ void process_lcd_p_command(const char* command) {
case 'X': case 'X':
// cancel print // cancel print
write_to_lcd_P(PSTR("{SYS:CANCELING}")); write_to_lcd_P(PSTR("{SYS:CANCELING}"));
card.stopSDPrint();
clear_command_queue(); clear_command_queue();
quickstop_stepper(); quickstop_stepper();
print_job_timer.stop(); print_job_timer.stop();

7
Marlin/src/sd/cardreader.cpp

@ -33,6 +33,10 @@
#include "../core/language.h" #include "../core/language.h"
#include "../gcode/queue.h" #include "../gcode/queue.h"
#if ENABLED(ADVANCED_PAUSE_FEATURE)
#include "../feature/pause.h"
#endif
#include <ctype.h> #include <ctype.h>
#define LONGEST_FILENAME (longFilename[0] ? longFilename : filename) #define LONGEST_FILENAME (longFilename[0] ? longFilename : filename)
@ -325,6 +329,9 @@ void CardReader::startFileprint() {
} }
void CardReader::stopSDPrint() { void CardReader::stopSDPrint() {
#if ENABLED(ADVANCED_PAUSE_FEATURE)
did_pause_print = 0;
#endif
sdprinting = false; sdprinting = false;
if (isFileOpen()) file.close(); if (isFileOpen()) file.close();
} }

Loading…
Cancel
Save