Pārlūkot izejas kodu

Add disable_e_steppers function

Scott Lahteine 7 gadus atpakaļ
vecāks
revīzija
4c7f14752a
3 mainītis faili ar 13 papildinājumiem un 24 dzēšanām
  1. 1
    0
      Marlin/Marlin.h
  2. 11
    18
      Marlin/Marlin_main.cpp
  3. 1
    6
      Marlin/planner.cpp

+ 1
- 0
Marlin/Marlin.h Parādīt failu

@@ -223,6 +223,7 @@ void manage_inactivity(bool ignore_stepper_queue = false);
223 223
 #define _AXIS(AXIS) AXIS ##_AXIS
224 224
 
225 225
 void enable_all_steppers();
226
+void disable_e_steppers();
226 227
 void disable_all_steppers();
227 228
 
228 229
 void FlushSerialRequestResend();

+ 11
- 18
Marlin/Marlin_main.cpp Parādīt failu

@@ -5918,12 +5918,7 @@ inline void gcode_M18_M84() {
5918 5918
       if (code_seen('Y')) disable_y();
5919 5919
       if (code_seen('Z')) disable_z();
5920 5920
       #if ((E0_ENABLE_PIN != X_ENABLE_PIN) && (E1_ENABLE_PIN != Y_ENABLE_PIN)) // Only enable on boards that have seperate ENABLE_PINS
5921
-        if (code_seen('E')) {
5922
-          disable_e0();
5923
-          disable_e1();
5924
-          disable_e2();
5925
-          disable_e3();
5926
-        }
5921
+        if (code_seen('E')) disable_e_steppers();
5927 5922
       #endif
5928 5923
     }
5929 5924
   }
@@ -7330,10 +7325,7 @@ inline void gcode_M503() {
7330 7325
 
7331 7326
     // Synchronize steppers and then disable extruders steppers for manual filament changing
7332 7327
     stepper.synchronize();
7333
-    disable_e0();
7334
-    disable_e1();
7335
-    disable_e2();
7336
-    disable_e3();
7328
+    disable_e_steppers();
7337 7329
     delay(100);
7338 7330
 
7339 7331
     millis_t nozzle_timeout = millis() + (millis_t)(FILAMENT_CHANGE_NOZZLE_TIMEOUT) * 1000L;
@@ -10123,16 +10115,20 @@ void enable_all_steppers() {
10123 10115
   enable_e3();
10124 10116
 }
10125 10117
 
10126
-void disable_all_steppers() {
10127
-  disable_x();
10128
-  disable_y();
10129
-  disable_z();
10118
+void disable_e_steppers() {
10130 10119
   disable_e0();
10131 10120
   disable_e1();
10132 10121
   disable_e2();
10133 10122
   disable_e3();
10134 10123
 }
10135 10124
 
10125
+void disable_all_steppers() {
10126
+  disable_x();
10127
+  disable_y();
10128
+  disable_z();
10129
+  disable_e_steppers();
10130
+}
10131
+
10136 10132
 #if ENABLED(AUTOMATIC_CURRENT_CONTROL)
10137 10133
 
10138 10134
   void automatic_current_control(const TMC2130Stepper &st) {
@@ -10240,10 +10236,7 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
10240 10236
       disable_z();
10241 10237
     #endif
10242 10238
     #if ENABLED(DISABLE_INACTIVE_E)
10243
-      disable_e0();
10244
-      disable_e1();
10245
-      disable_e2();
10246
-      disable_e3();
10239
+      disable_e_steppers();
10247 10240
     #endif
10248 10241
   }
10249 10242
 

+ 1
- 6
Marlin/planner.cpp Parādīt failu

@@ -450,12 +450,7 @@ void Planner::check_axes_activity() {
450 450
     if (!axis_active[Z_AXIS]) disable_z();
451 451
   #endif
452 452
   #if ENABLED(DISABLE_E)
453
-    if (!axis_active[E_AXIS]) {
454
-      disable_e0();
455
-      disable_e1();
456
-      disable_e2();
457
-      disable_e3();
458
-    }
453
+    if (!axis_active[E_AXIS]) disable_e_steppers();
459 454
   #endif
460 455
 
461 456
   #if FAN_COUNT > 0

Notiek ielāde…
Atcelt
Saglabāt