瀏覽代碼

Tweak cleaning buffer / SD finished command

Scott Lahteine 7 年之前
父節點
當前提交
50366b00d5
共有 2 個文件被更改,包括 5 次插入4 次删除
  1. 2
    2
      Marlin/src/module/stepper.cpp
  2. 3
    2
      Marlin/src/sd/cardreader.cpp

+ 2
- 2
Marlin/src/module/stepper.cpp 查看文件

@@ -397,8 +397,8 @@ void Stepper::isr() {
397 397
     else {
398 398
       planner.discard_current_block();
399 399
       --cleaning_buffer_counter;                // Count down for abort print
400
-      #ifdef SD_FINISHED_RELEASECOMMAND
401
-        if (!cleaning_buffer_counter && (SD_FINISHED_STEPPERRELEASE)) enqueue_and_echo_commands_P(PSTR(SD_FINISHED_RELEASECOMMAND));
400
+      #if ENABLED(SD_FINISHED_STEPPERRELEASE) && defined(SD_FINISHED_RELEASECOMMAND)
401
+        if (!cleaning_buffer_counter) enqueue_and_echo_commands_P(PSTR(SD_FINISHED_RELEASECOMMAND));
402 402
       #endif
403 403
     }
404 404
     current_block = NULL;                       // Prep to get a new block after cleaning

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

@@ -896,8 +896,9 @@ void CardReader::printingHasFinished() {
896 896
   }
897 897
   else {
898 898
     sdprinting = false;
899
-    if (SD_FINISHED_STEPPERRELEASE)
900
-      enqueue_and_echo_commands_P(PSTR(SD_FINISHED_RELEASECOMMAND));
899
+    #if ENABLED(SD_FINISHED_STEPPERRELEASE) && defined(SD_FINISHED_RELEASECOMMAND)
900
+      stepper.cleaning_buffer_counter = 1; // The command will fire from the Stepper ISR
901
+    #endif
901 902
     print_job_timer.stop();
902 903
     if (print_job_timer.duration() > 60)
903 904
       enqueue_and_echo_commands_P(PSTR("M31"));

Loading…
取消
儲存