Browse Source

Abort SD followup

Scott Lahteine 4 years ago
parent
commit
61225e685d
1 changed files with 24 additions and 20 deletions
  1. 24
    20
      Marlin/src/Marlin.cpp

+ 24
- 20
Marlin/src/Marlin.cpp View File

@@ -378,27 +378,31 @@ void startOrResumeJob() {
378 378
   print_job_timer.start();
379 379
 }
380 380
 
381
-void abortSDPrinting() {
382
-  card.stopSDPrint(
383
-    #if SD_RESORT
384
-      true
381
+#if ENABLED(SDSUPPORT)
382
+
383
+  void abortSDPrinting() {
384
+    card.stopSDPrint(
385
+      #if SD_RESORT
386
+        true
387
+      #endif
388
+    );
389
+    queue.clear();
390
+    quickstop_stepper();
391
+    print_job_timer.stop();
392
+    #if DISABLED(SD_ABORT_NO_COOLDOWN)
393
+      thermalManager.disable_all_heaters();
385 394
     #endif
386
-  );
387
-  queue.clear();
388
-  quickstop_stepper();
389
-  print_job_timer.stop();
390
-  #if DISABLED(SD_ABORT_NO_COOLDOWN)
391
-    thermalManager.disable_all_heaters();
392
-  #endif
393
-  thermalManager.zero_fan_speeds();
394
-  wait_for_heatup = false;
395
-  #if ENABLED(POWER_LOSS_RECOVERY)
396
-    card.removeJobRecoveryFile();
397
-  #endif
398
-  #ifdef EVENT_GCODE_SD_STOP
399
-    queue.inject_P(PSTR(EVENT_GCODE_SD_STOP));
400
-  #endif
401
-}
395
+    thermalManager.zero_fan_speeds();
396
+    wait_for_heatup = false;
397
+    #if ENABLED(POWER_LOSS_RECOVERY)
398
+      card.removeJobRecoveryFile();
399
+    #endif
400
+    #ifdef EVENT_GCODE_SD_STOP
401
+      queue.inject_P(PSTR(EVENT_GCODE_SD_STOP));
402
+    #endif
403
+  }
404
+
405
+#endif
402 406
 
403 407
 /**
404 408
  * Manage several activities:

Loading…
Cancel
Save