Scott Lahteine 6 лет назад
Родитель
Сommit
c03bac9ad4
Аккаунт пользователя с таким Email не найден
1 измененных файлов: 6 добавлений и 2 удалений
  1. 6
    2
      Marlin/src/gcode/queue.cpp

+ 6
- 2
Marlin/src/gcode/queue.cpp Просмотреть файл

535
 
535
 
536
 #endif // FAST_FILE_TRANSFER
536
 #endif // FAST_FILE_TRANSFER
537
 
537
 
538
+FORCE_INLINE bool is_M29(const char * const cmd) {
539
+  return cmd[0] == 'M' && cmd[1] == '2' && cmd[2] == '9' && !WITHIN(cmd[3], '0', '9');
540
+}
541
+
538
 /**
542
 /**
539
  * Get all commands waiting on the serial port and queue them.
543
  * Get all commands waiting on the serial port and queue them.
540
  * Exit when the buffer is full or when no more characters are
544
  * Exit when the buffer is full or when no more characters are
631
         }
635
         }
632
         #if ENABLED(SDSUPPORT)
636
         #if ENABLED(SDSUPPORT)
633
           // Pronterface "M29" and "M29 " has no line number 
637
           // Pronterface "M29" and "M29 " has no line number 
634
-          else if (card.flag.saving && !(command[0] == 'M' && command[1] == '2' && command[2] == '9' && (command[3] == '\0' || command[3] == ' ' ||  || command[3] == '*')))
638
+          else if (card.flag.saving && !is_M29(command))
635
             return gcode_line_error(PSTR(MSG_ERR_NO_CHECKSUM), i);
639
             return gcode_line_error(PSTR(MSG_ERR_NO_CHECKSUM), i);
636
         #endif
640
         #endif
637
 
641
 
840
 
844
 
841
     if (card.flag.saving) {
845
     if (card.flag.saving) {
842
       char* command = command_queue[cmd_queue_index_r];
846
       char* command = command_queue[cmd_queue_index_r];
843
-      if (command[0] == 'M' && command[1] == '2' && command[2] == '9' && (command[3] == '\0' || command[3] == ' ' ||  || command[3] == '*')) {
847
+      if (is_M29(command)) {
844
         // M29 closes the file
848
         // M29 closes the file
845
         card.closefile();
849
         card.closefile();
846
         SERIAL_ECHOLNPGM(MSG_FILE_SAVED);
850
         SERIAL_ECHOLNPGM(MSG_FILE_SAVED);

Загрузка…
Отмена
Сохранить