Browse Source

Add disable_e_steppers function

Scott Lahteine 8 years ago
parent
commit
4c7f14752a
3 changed files with 13 additions and 24 deletions
  1. 1
    0
      Marlin/Marlin.h
  2. 11
    18
      Marlin/Marlin_main.cpp
  3. 1
    6
      Marlin/planner.cpp

+ 1
- 0
Marlin/Marlin.h View File

223
 #define _AXIS(AXIS) AXIS ##_AXIS
223
 #define _AXIS(AXIS) AXIS ##_AXIS
224
 
224
 
225
 void enable_all_steppers();
225
 void enable_all_steppers();
226
+void disable_e_steppers();
226
 void disable_all_steppers();
227
 void disable_all_steppers();
227
 
228
 
228
 void FlushSerialRequestResend();
229
 void FlushSerialRequestResend();

+ 11
- 18
Marlin/Marlin_main.cpp View File

5918
       if (code_seen('Y')) disable_y();
5918
       if (code_seen('Y')) disable_y();
5919
       if (code_seen('Z')) disable_z();
5919
       if (code_seen('Z')) disable_z();
5920
       #if ((E0_ENABLE_PIN != X_ENABLE_PIN) && (E1_ENABLE_PIN != Y_ENABLE_PIN)) // Only enable on boards that have seperate ENABLE_PINS
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
       #endif
5922
       #endif
5928
     }
5923
     }
5929
   }
5924
   }
7330
 
7325
 
7331
     // Synchronize steppers and then disable extruders steppers for manual filament changing
7326
     // Synchronize steppers and then disable extruders steppers for manual filament changing
7332
     stepper.synchronize();
7327
     stepper.synchronize();
7333
-    disable_e0();
7334
-    disable_e1();
7335
-    disable_e2();
7336
-    disable_e3();
7328
+    disable_e_steppers();
7337
     delay(100);
7329
     delay(100);
7338
 
7330
 
7339
     millis_t nozzle_timeout = millis() + (millis_t)(FILAMENT_CHANGE_NOZZLE_TIMEOUT) * 1000L;
7331
     millis_t nozzle_timeout = millis() + (millis_t)(FILAMENT_CHANGE_NOZZLE_TIMEOUT) * 1000L;
10123
   enable_e3();
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
   disable_e0();
10119
   disable_e0();
10131
   disable_e1();
10120
   disable_e1();
10132
   disable_e2();
10121
   disable_e2();
10133
   disable_e3();
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
 #if ENABLED(AUTOMATIC_CURRENT_CONTROL)
10132
 #if ENABLED(AUTOMATIC_CURRENT_CONTROL)
10137
 
10133
 
10138
   void automatic_current_control(const TMC2130Stepper &st) {
10134
   void automatic_current_control(const TMC2130Stepper &st) {
10240
       disable_z();
10236
       disable_z();
10241
     #endif
10237
     #endif
10242
     #if ENABLED(DISABLE_INACTIVE_E)
10238
     #if ENABLED(DISABLE_INACTIVE_E)
10243
-      disable_e0();
10244
-      disable_e1();
10245
-      disable_e2();
10246
-      disable_e3();
10239
+      disable_e_steppers();
10247
     #endif
10240
     #endif
10248
   }
10241
   }
10249
 
10242
 

+ 1
- 6
Marlin/planner.cpp View File

450
     if (!axis_active[Z_AXIS]) disable_z();
450
     if (!axis_active[Z_AXIS]) disable_z();
451
   #endif
451
   #endif
452
   #if ENABLED(DISABLE_E)
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
   #endif
454
   #endif
460
 
455
 
461
   #if FAN_COUNT > 0
456
   #if FAN_COUNT > 0

Loading…
Cancel
Save