Add M524 to abort SD printing (#12155)

This commit is contained in:
TheSFReader 2018-10-19 21:25:07 +02:00 committed by Scott Lahteine
parent d26d9d5b81
commit 1fb9b299d4
9 changed files with 23 additions and 21 deletions

View File

@ -972,11 +972,8 @@ void loop() {
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
card.checkautostart(); card.checkautostart();
#endif
#if ENABLED(SDSUPPORT) && (ENABLED(ULTIPANEL) || ENABLED(EXTENSIBLE_UI)) if (card.abort_sd_printing) {
if (abort_sd_printing) {
abort_sd_printing = false;
card.stopSDPrint( card.stopSDPrint(
#if SD_RESORT #if SD_RESORT
true true
@ -992,7 +989,7 @@ void loop() {
card.removeJobRecoveryFile(); card.removeJobRecoveryFile();
#endif #endif
} }
#endif // SDSUPPORT && (ENABLED(ULTIPANEL) || ENABLED(EXTENSIBLE_UI)) #endif // SDSUPPORT
if (commands_in_queue < BUFSIZE) get_available_commands(); if (commands_in_queue < BUFSIZE) get_available_commands();
advance_command_queue(); advance_command_queue();

View File

@ -584,6 +584,10 @@ void GcodeSuite::process_parsed_command(
case 504: M504(); break; // M504: Validate EEPROM contents case 504: M504(); break; // M504: Validate EEPROM contents
#endif #endif
#if ENABLED(SDSUPPORT)
case 524: M524(); break; // M524: Abort the current SD print job
#endif
#if ENABLED(ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED) #if ENABLED(ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED)
case 540: M540(); break; // M540: Set abort on endstop hit for SD printing case 540: M540(); break; // M540: Set abort on endstop hit for SD printing
#endif #endif

View File

@ -202,6 +202,7 @@
* M501 - Restore parameters from EEPROM. (Requires EEPROM_SETTINGS) * M501 - Restore parameters from EEPROM. (Requires EEPROM_SETTINGS)
* M502 - Revert to the default "factory settings". ** Does not write them to EEPROM! ** * M502 - Revert to the default "factory settings". ** Does not write them to EEPROM! **
* M503 - Print the current settings (in memory): "M503 S<verbose>". S0 specifies compact output. * M503 - Print the current settings (in memory): "M503 S<verbose>". S0 specifies compact output.
* M524 - Abort the current SD print job (started with M24)
* M540 - Enable/disable SD card abort on endstop hit: "M540 S<state>". (Requires ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED) * M540 - Enable/disable SD card abort on endstop hit: "M540 S<state>". (Requires ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED)
* M600 - Pause for filament change: "M600 X<pos> Y<pos> Z<raise> E<first_retract> L<later_retract>". (Requires ADVANCED_PAUSE_FEATURE) * M600 - Pause for filament change: "M600 X<pos> Y<pos> Z<raise> E<first_retract> L<later_retract>". (Requires ADVANCED_PAUSE_FEATURE)
* M603 - Configure filament change: "M603 T<tool> U<unload_length> L<load_length>". (Requires ADVANCED_PAUSE_FEATURE) * M603 - Configure filament change: "M603 T<tool> U<unload_length> L<load_length>". (Requires ADVANCED_PAUSE_FEATURE)
@ -719,6 +720,10 @@ private:
static void M504(); static void M504();
#endif #endif
#if ENABLED(SDSUPPORT)
static void M524();
#endif
#if ENABLED(ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED) #if ENABLED(ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED)
static void M540(); static void M540();
#endif #endif

View File

@ -244,6 +244,13 @@ void GcodeSuite::M32() {
#endif // SDCARD_SORT_ALPHA && SDSORT_GCODE #endif // SDCARD_SORT_ALPHA && SDSORT_GCODE
/**
* M524: Abort the current SD print job (started with M24)
*/
void GcodeSuite::M524() {
if (IS_SD_PRINTING()) card.abort_sd_printing = true;
}
/** /**
* M928: Start SD Write * M928: Start SD Write
*/ */

View File

@ -37,10 +37,6 @@
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
#include "../../sd/cardreader.h" #include "../../sd/cardreader.h"
#include "../../feature/emergency_parser.h" #include "../../feature/emergency_parser.h"
bool abort_sd_printing; // =false
#else
constexpr bool abort_sd_printing = false;
#endif #endif
#if ENABLED(PRINTCOUNTER) #if ENABLED(PRINTCOUNTER)
@ -476,7 +472,7 @@ namespace UI {
void stopPrint() { void stopPrint() {
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
wait_for_heatup = wait_for_user = false; wait_for_heatup = wait_for_user = false;
abort_sd_printing = true; card.abort_sd_printing = true;
UI::onStatusChanged(PSTR(MSG_PRINT_ABORTED)); UI::onStatusChanged(PSTR(MSG_PRINT_ABORTED));
#endif #endif
} }

View File

@ -895,11 +895,9 @@ void lcd_quick_feedback(const bool clear_buttons) {
lcd_reset_status(); lcd_reset_status();
} }
bool abort_sd_printing; // =false
void lcd_sdcard_stop() { void lcd_sdcard_stop() {
wait_for_heatup = wait_for_user = false; wait_for_heatup = wait_for_user = false;
abort_sd_printing = true; card.abort_sd_printing = true;
lcd_setstatusPGM(PSTR(MSG_PRINT_ABORTED), -1); lcd_setstatusPGM(PSTR(MSG_PRINT_ABORTED), -1);
lcd_return_to_status(); lcd_return_to_status();
} }

View File

@ -288,10 +288,5 @@
void lcd_reselect_last_file(); void lcd_reselect_last_file();
#endif #endif
#if (ENABLED(EXTENSIBLE_UI) || ENABLED(ULTIPANEL)) && ENABLED(SDSUPPORT)
extern bool abort_sd_printing;
#else
constexpr bool abort_sd_printing = false;
#endif
#endif // ULTRALCD_H #endif // ULTRALCD_H

View File

@ -351,7 +351,7 @@ void CardReader::stopSDPrint(
#if ENABLED(ADVANCED_PAUSE_FEATURE) #if ENABLED(ADVANCED_PAUSE_FEATURE)
did_pause_print = 0; did_pause_print = 0;
#endif #endif
sdprinting = false; sdprinting = abort_sd_printing = false;
if (isFileOpen()) file.close(); if (isFileOpen()) file.close();
#if SD_RESORT #if SD_RESORT
if (re_sort) presort(); if (re_sort) presort();

View File

@ -149,7 +149,7 @@ public:
FORCE_INLINE char* longest_filename() { return longFilename[0] ? longFilename : filename; } FORCE_INLINE char* longest_filename() { return longFilename[0] ? longFilename : filename; }
public: public:
bool saving, logging, sdprinting, cardOK, filenameIsDir; bool saving, logging, sdprinting, cardOK, filenameIsDir, abort_sd_printing;
char filename[FILENAME_LENGTH], longFilename[LONG_FILENAME_LENGTH]; char filename[FILENAME_LENGTH], longFilename[LONG_FILENAME_LENGTH];
int8_t autostart_index; int8_t autostart_index;
private: private: