Browse Source

Merge pull request #4720 from thinkyhead/rc_allow_stepper_omission

Patch stepper.cpp to allow omitting steppers
Scott Lahteine 8 years ago
parent
commit
8241cf9901
1 changed files with 27 additions and 9 deletions
  1. 27
    9
      Marlin/stepper.cpp

+ 27
- 9
Marlin/stepper.cpp View File

@@ -289,9 +289,15 @@ void Stepper::set_directions() {
289 289
       count_direction[AXIS ##_AXIS] = 1; \
290 290
     }
291 291
 
292
-  SET_STEP_DIR(X); // A
293
-  SET_STEP_DIR(Y); // B
294
-  SET_STEP_DIR(Z); // C
292
+  #if HAS_X_DIR
293
+    SET_STEP_DIR(X); // A
294
+  #endif
295
+  #if HAS_Y_DIR
296
+    SET_STEP_DIR(Y); // B
297
+  #endif
298
+  #if HAS_Z_DIR
299
+    SET_STEP_DIR(Z); // C
300
+  #endif
295 301
 
296 302
   #if DISABLED(ADVANCE)
297 303
     if (motor_direction(E_AXIS)) {
@@ -447,9 +453,15 @@ void Stepper::isr() {
447 453
         _COUNTER(AXIS) += current_block->steps[_AXIS(AXIS)]; \
448 454
         if (_COUNTER(AXIS) > 0) { _APPLY_STEP(AXIS)(!_INVERT_STEP_PIN(AXIS),0); }
449 455
 
450
-      STEP_ADD(X);
451
-      STEP_ADD(Y);
452
-      STEP_ADD(Z);
456
+      #if HAS_X_STEP
457
+        STEP_ADD(X);
458
+      #endif
459
+      #if HAS_Y_STEP
460
+        STEP_ADD(Y);
461
+      #endif
462
+      #if HAS_Z_STEP
463
+        STEP_ADD(Z);
464
+      #endif
453 465
 
454 466
       #if DISABLED(ADVANCE) && DISABLED(LIN_ADVANCE)
455 467
         #if ENABLED(MIXING_EXTRUDER)
@@ -474,9 +486,15 @@ void Stepper::isr() {
474 486
           _APPLY_STEP(AXIS)(_INVERT_STEP_PIN(AXIS),0); \
475 487
         }
476 488
 
477
-      STEP_IF_COUNTER(X);
478
-      STEP_IF_COUNTER(Y);
479
-      STEP_IF_COUNTER(Z);
489
+      #if HAS_X_STEP
490
+        STEP_IF_COUNTER(X);
491
+      #endif
492
+      #if HAS_Y_STEP
493
+        STEP_IF_COUNTER(Y);
494
+      #endif
495
+      #if HAS_Z_STEP
496
+        STEP_IF_COUNTER(Z);
497
+      #endif
480 498
 
481 499
       #if DISABLED(ADVANCE) && DISABLED(LIN_ADVANCE)
482 500
         #if ENABLED(MIXING_EXTRUDER)

Loading…
Cancel
Save