MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Un-pause on print cancellation (#9779)

Browse Source
This commit is contained in:
Scott Lahteine 2018-02-23 13:42:21 -06:00 committed by GitHub
parent 0d9d11a2d5
commit 742733d714
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/Marlin.h
View File

@ -449,6 +449,7 @@ void report_current_position();
#endif #endif
#if ENABLED(ADVANCED_PAUSE_FEATURE) #if ENABLED(ADVANCED_PAUSE_FEATURE)
extern int8_t did_pause_print;
extern AdvancedPauseMenuResponse advanced_pause_menu_response; extern AdvancedPauseMenuResponse advanced_pause_menu_response;
extern float filament_change_unload_length[EXTRUDERS], extern float filament_change_unload_length[EXTRUDERS],
filament_change_load_length[EXTRUDERS]; filament_change_load_length[EXTRUDERS];

2
Marlin/Marlin_main.cpp
View File

@ -6406,7 +6406,7 @@ inline void gcode_M17() {
} }
static float resume_position[XYZE]; static float resume_position[XYZE];
static int8_t did_pause_print = 0; int8_t did_pause_print = 0;
#if HAS_BUZZER #if HAS_BUZZER
static void filament_change_beep(const int8_t max_beep_count, const bool init=false) { static void filament_change_beep(const int8_t max_beep_count, const bool init=false) {

3
Marlin/cardreader.cpp
View File

@ -296,6 +296,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();
} }

1
Marlin/malyanlcd.cpp
View File

@ -225,6 +225,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();