asaril/marlin2_i2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update queue.cpp

Browse source
This commit is contained in:
Scott Lahteine 2019-02-04 07:17:40 -06:00 committed by GitHub
parent a49f0205ea
commit c03bac9ad4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -535,6 +535,10 @@ static int read_serial(const uint8_t index) {
#endif // FAST_FILE_TRANSFER #endif // FAST_FILE_TRANSFER
FORCE_INLINE bool is_M29(const char * const cmd) {
return cmd[0] == 'M' && cmd[1] == '2' && cmd[2] == '9' && !WITHIN(cmd[3], '0', '9');
}
/** /**
* Get all commands waiting on the serial port and queue them. * Get all commands waiting on the serial port and queue them.
* Exit when the buffer is full or when no more characters are * Exit when the buffer is full or when no more characters are
@ -631,7 +635,7 @@ inline void get_serial_commands() {
} }
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Pronterface "M29" and "M29 " has no line number // Pronterface "M29" and "M29 " has no line number
else if (card.flag.saving && !(command[0] == 'M' && command[1] == '2' && command[2] == '9' && (command[3] == '\0' || command[3] == ' ' || || command[3] == '*'))) else if (card.flag.saving && !is_M29(command))
return gcode_line_error(PSTR(MSG_ERR_NO_CHECKSUM), i); return gcode_line_error(PSTR(MSG_ERR_NO_CHECKSUM), i);
#endif #endif
@ -840,7 +844,7 @@ void advance_command_queue() {
if (card.flag.saving) { if (card.flag.saving) {
char* command = command_queue[cmd_queue_index_r]; char* command = command_queue[cmd_queue_index_r];
if (command[0] == 'M' && command[1] == '2' && command[2] == '9' && (command[3] == '\0' || command[3] == ' ' || || command[3] == '*')) { if (is_M29(command)) {
// M29 closes the file // M29 closes the file
card.closefile(); card.closefile();
SERIAL_ECHOLNPGM(MSG_FILE_SAVED); SERIAL_ECHOLNPGM(MSG_FILE_SAVED);