0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Pause SD queue early on M25 (#21317)

Browse source
This commit is contained in:
Scott Lahteine 2021-03-12 08:34:22 -06:00 committed by GitHub
parent 8532c2b9b6
commit 71f2617263
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Marlin/src/gcode/host/M115.cpp
View file

@ -120,6 +120,9 @@ void GcodeSuite::M115() {
// REPEAT (M808) // REPEAT (M808)
cap_line(PSTR("REPEAT"), ENABLED(GCODE_REPEAT_MARKERS)); cap_line(PSTR("REPEAT"), ENABLED(GCODE_REPEAT_MARKERS));
// SD_WRITE (M928, M28, M29)
cap_line(PSTR("SD_WRITE"), ENABLED(SDSUPPORT) && DISABLED(SDCARD_READONLY));
// AUTOREPORT_SD_STATUS (M27 extension) // AUTOREPORT_SD_STATUS (M27 extension)
cap_line(PSTR("AUTOREPORT_SD_STATUS"), ENABLED(AUTO_REPORT_SD_STATUS)); cap_line(PSTR("AUTOREPORT_SD_STATUS"), ENABLED(AUTO_REPORT_SD_STATUS));

8
Marlin/src/gcode/queue.cpp
View file

@ -567,7 +567,6 @@ void GCodeQueue::get_serial_commands() {
const bool is_eol = ISEOL(sd_char); const bool is_eol = ISEOL(sd_char);
if (is_eol || card_eof) { if (is_eol || card_eof) {
// Reset stream state, terminate the buffer, and commit a non-empty command // Reset stream state, terminate the buffer, and commit a non-empty command
if (!is_eol && sd_count) ++sd_count; // End of file with no newline if (!is_eol && sd_count) ++sd_count; // End of file with no newline
if (!process_line_done(sd_input_state, command.buffer, sd_count)) { if (!process_line_done(sd_input_state, command.buffer, sd_count)) {
@ -575,6 +574,13 @@ void GCodeQueue::get_serial_commands() {
// M808 L saves the sdpos of the next line. M808 loops to a new sdpos. // M808 L saves the sdpos of the next line. M808 loops to a new sdpos.
TERN_(GCODE_REPEAT_MARKERS, repeat.early_parse_M808(command.buffer)); TERN_(GCODE_REPEAT_MARKERS, repeat.early_parse_M808(command.buffer));
#if DISABLED(PARK_HEAD_ON_PAUSE)
// When M25 is non-blocking it can still suspend SD commands
// Otherwise the M125 handler needs to know SD printing is active
if (command.buffer[0] == 'M' && command.buffer[1] == '2' && command.buffer[2] == '5' && !NUMERIC(command.buffer[3]))
card.pauseSDPrint();
#endif
// Put the new command into the buffer (no "ok" sent) // Put the new command into the buffer (no "ok" sent)
ring_buffer.commit_command(true); ring_buffer.commit_command(true);

4
Marlin/src/gcode/sd/M24_M25.cpp
View file

@ -87,6 +87,10 @@ void GcodeSuite::M24() {
/** /**
* M25: Pause SD Print * M25: Pause SD Print
*
* With PARK_HEAD_ON_PAUSE:
* Invoke M125 to store the current position and move to the park
* position. M24 will move the head back before resuming the print.
*/ */
void GcodeSuite::M25() { void GcodeSuite::M25() {