瀏覽代碼

Simply run M31 at the end of an SD print

Scott Lahteine 9 年之前
父節點
當前提交
34da77dad3
共有 2 個檔案被更改,包括 3 行新增9 行删除
  1. 0
    6
      Marlin/Marlin_main.cpp
  2. 3
    3
      Marlin/cardreader.cpp

+ 0
- 6
Marlin/Marlin_main.cpp 查看文件

1170
         if (card_eof) {
1170
         if (card_eof) {
1171
           SERIAL_PROTOCOLLNPGM(MSG_FILE_PRINTED);
1171
           SERIAL_PROTOCOLLNPGM(MSG_FILE_PRINTED);
1172
           print_job_timer.stop();
1172
           print_job_timer.stop();
1173
-          char time[30];
1174
-          millis_t t = print_job_timer.duration();
1175
-          sprintf_P(time, PSTR("%i " MSG_END_HOUR " %i " MSG_END_MINUTE), int(t / 60 / 60), int(t / 60) % 60);
1176
-          SERIAL_ECHO_START;
1177
-          SERIAL_ECHOLN(time);
1178
-          lcd_setstatus(time, true);
1179
           card.printingHasFinished();
1173
           card.printingHasFinished();
1180
           card.checkautostart(true);
1174
           card.checkautostart(true);
1181
         }
1175
         }

+ 3
- 3
Marlin/cardreader.cpp 查看文件

602
 
602
 
603
 void CardReader::printingHasFinished() {
603
 void CardReader::printingHasFinished() {
604
   stepper.synchronize();
604
   stepper.synchronize();
605
+  file.close();
605
   if (file_subcall_ctr > 0) { // Heading up to a parent file that called current as a procedure.
606
   if (file_subcall_ctr > 0) { // Heading up to a parent file that called current as a procedure.
606
-    file.close();
607
     file_subcall_ctr--;
607
     file_subcall_ctr--;
608
     openFile(proc_filenames[file_subcall_ctr], true, true);
608
     openFile(proc_filenames[file_subcall_ctr], true, true);
609
     setIndex(filespos[file_subcall_ctr]);
609
     setIndex(filespos[file_subcall_ctr]);
610
     startFileprint();
610
     startFileprint();
611
   }
611
   }
612
   else {
612
   else {
613
-    file.close();
614
     sdprinting = false;
613
     sdprinting = false;
615
     if (SD_FINISHED_STEPPERRELEASE)
614
     if (SD_FINISHED_STEPPERRELEASE)
616
       enqueue_and_echo_commands_P(PSTR(SD_FINISHED_RELEASECOMMAND));
615
       enqueue_and_echo_commands_P(PSTR(SD_FINISHED_RELEASECOMMAND));
617
-    thermalManager.autotempShutdown();
616
+    print_job_timer.stop();
617
+    enqueue_and_echo_commands_P(PSTR("M31"));
618
   }
618
   }
619
 }
619
 }
620
 
620
 

Loading…
取消
儲存