3D-printing/Marlin
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2026-03-07 10:34:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge 204ba64266 into a6ebfe14cc

Browse source
This commit is contained in:
ellensp 2026-03-03 19:37:20 +13:00 • committed by GitHub
commit 6b7925162d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Marlin/Configuration_adv.h
View file

@ -2061,6 +2061,10 @@
#define DEFAULT_SHARED_VOLUME USB_FLASH_DRIVE // :[ 'SD_ONBOARD', 'USB_FLASH_DRIVE' ]
#endif
// Maximum number of consecutive SD card read errors before aborting the print
// Prevents infinite loops when reading from SD card with hardware/communication faults
#define SD_MAX_READ_ERRORS 5
#endif // HAS_MEDIA
/**

2
Marlin/src/core/language.h
View file

@ -186,6 +186,8 @@
#define STR_SD_NOT_PRINTING "Not SD printing"
#define STR_SD_ERR_WRITE_TO_FILE "error writing to file"
#define STR_SD_ERR_READ "SD read error"
#define STR_SD_ERR_TOO_MANY_READ_ERRORS "Too many SD read errors, print aborted"
#define STR_SD_ERR_CARD_REMOVED "SD card removed, print aborted"
#define STR_SD_CANT_ENTER_SUBDIR "Cannot enter subdir: "
#define STR_ENDSTOPS_HIT "endstops hit: "

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

@ -570,11 +570,30 @@ void GCodeQueue::get_serial_commands() {
// Get commands if there are more in the file
if (!card.isStillFetching()) return;
#if HAS_SD_DETECT
// Abort print if SD card was removed mid-print
if (!card.isInserted()) {
SERIAL_ERROR_MSG(STR_SD_ERR_CARD_REMOVED);
card.abortFilePrintNow();
return;
}
#endif
int sd_count = 0;
uint16_t sd_read_errors = 0;
while (!ring_buffer.full() && !card.eof()) {
const int16_t n = card.get();
const bool card_eof = card.eof();
if (n < 0 && !card_eof) { SERIAL_ERROR_MSG(STR_SD_ERR_READ); continue; }
if (n < 0 && !card_eof) {
SERIAL_ERROR_MSG(STR_SD_ERR_READ);
if (++sd_read_errors >= SD_MAX_READ_ERRORS) {
SERIAL_ERROR_MSG(STR_SD_ERR_TOO_MANY_READ_ERRORS);
card.abortFilePrintNow();
break;
}
continue;
}
sd_read_errors = 0; // Reset on successful read
CommandLine &command = ring_buffer.commands[ring_buffer.index_w];
const char sd_char = (char)n;