Skip to content

Commit 573bc73

Browse files
thinkyheadthinkyhead
committed
🎨 NORM_E_DIR => FWD_E_DIR
1 parent 5abb594 commit 573bc73

File tree

3 files changed

+63
-61
lines changed

3 files changed

+63
-61
lines changed

‎Marlin/src/module/endstops.cpp

+37-35
Original file line numberDiff line numberDiff line change
@@ -866,36 +866,38 @@ void Endstops::update() {
866866

867867
// Signal, after validation, if an endstop limit is pressed or not
868868

869-
if (stepper.axis_is_moving(X_AXIS)) {
870-
if (stepper.motor_direction(X_AXIS_HEAD)) { // -direction
871-
#if HAS_X_MIN || (X_SPI_SENSORLESS && X_HOME_TO_MIN)
872-
PROCESS_ENDSTOP_X(MIN);
873-
#if CORE_DIAG(XY, Y, MIN)
874-
PROCESS_CORE_ENDSTOP(Y,MIN,X,MIN);
875-
#elif CORE_DIAG(XY, Y, MAX)
876-
PROCESS_CORE_ENDSTOP(Y,MAX,X,MIN);
877-
#elif CORE_DIAG(XZ, Z, MIN)
878-
PROCESS_CORE_ENDSTOP(Z,MIN,X,MIN);
879-
#elif CORE_DIAG(XZ, Z, MAX)
880-
PROCESS_CORE_ENDSTOP(Z,MAX,X,MIN);
869+
#if HAS_X_AXIS
870+
if (stepper.axis_is_moving(X_AXIS)) {
871+
if (stepper.motor_direction(X_AXIS_HEAD)) { // -direction
872+
#if HAS_X_MIN || (X_SPI_SENSORLESS && X_HOME_TO_MIN)
873+
PROCESS_ENDSTOP_X(MIN);
874+
#if CORE_DIAG(XY, Y, MIN)
875+
PROCESS_CORE_ENDSTOP(Y,MIN,X,MIN);
876+
#elif CORE_DIAG(XY, Y, MAX)
877+
PROCESS_CORE_ENDSTOP(Y,MAX,X,MIN);
878+
#elif CORE_DIAG(XZ, Z, MIN)
879+
PROCESS_CORE_ENDSTOP(Z,MIN,X,MIN);
880+
#elif CORE_DIAG(XZ, Z, MAX)
881+
PROCESS_CORE_ENDSTOP(Z,MAX,X,MIN);
882+
#endif
881883
#endif
882-
#endif
883-
}
884-
else { // +direction
885-
#if HAS_X_MAX || (X_SPI_SENSORLESS && X_HOME_TO_MAX)
886-
PROCESS_ENDSTOP_X(MAX);
887-
#if CORE_DIAG(XY, Y, MIN)
888-
PROCESS_CORE_ENDSTOP(Y,MIN,X,MAX);
889-
#elif CORE_DIAG(XY, Y, MAX)
890-
PROCESS_CORE_ENDSTOP(Y,MAX,X,MAX);
891-
#elif CORE_DIAG(XZ, Z, MIN)
892-
PROCESS_CORE_ENDSTOP(Z,MIN,X,MAX);
893-
#elif CORE_DIAG(XZ, Z, MAX)
894-
PROCESS_CORE_ENDSTOP(Z,MAX,X,MAX);
884+
}
885+
else { // +direction
886+
#if HAS_X_MAX || (X_SPI_SENSORLESS && X_HOME_TO_MAX)
887+
PROCESS_ENDSTOP_X(MAX);
888+
#if CORE_DIAG(XY, Y, MIN)
889+
PROCESS_CORE_ENDSTOP(Y,MIN,X,MAX);
890+
#elif CORE_DIAG(XY, Y, MAX)
891+
PROCESS_CORE_ENDSTOP(Y,MAX,X,MAX);
892+
#elif CORE_DIAG(XZ, Z, MIN)
893+
PROCESS_CORE_ENDSTOP(Z,MIN,X,MAX);
894+
#elif CORE_DIAG(XZ, Z, MAX)
895+
PROCESS_CORE_ENDSTOP(Z,MAX,X,MAX);
896+
#endif
895897
#endif
896-
#endif
898+
}
897899
}
898-
}
900+
#endif // HAS_X_AXIS
899901

900902
#if HAS_Y_AXIS
901903
if (stepper.axis_is_moving(Y_AXIS)) {
@@ -928,7 +930,7 @@ void Endstops::update() {
928930
#endif
929931
}
930932
}
931-
#endif
933+
#endif // HAS_Y_AXIS
932934

933935
#if HAS_Z_AXIS
934936
if (stepper.axis_is_moving(Z_AXIS)) {
@@ -973,7 +975,7 @@ void Endstops::update() {
973975
#endif
974976
}
975977
}
976-
#endif
978+
#endif // HAS_Z_AXIS
977979

978980
#if HAS_I_AXIS
979981
if (stepper.axis_is_moving(I_AXIS)) {
@@ -988,7 +990,7 @@ void Endstops::update() {
988990
#endif
989991
}
990992
}
991-
#endif
993+
#endif // HAS_I_AXIS
992994

993995
#if HAS_J_AXIS
994996
if (stepper.axis_is_moving(J_AXIS)) {
@@ -1003,7 +1005,7 @@ void Endstops::update() {
10031005
#endif
10041006
}
10051007
}
1006-
#endif
1008+
#endif // HAS_J_AXIS
10071009

10081010
#if HAS_K_AXIS
10091011
if (stepper.axis_is_moving(K_AXIS)) {
@@ -1018,7 +1020,7 @@ void Endstops::update() {
10181020
#endif
10191021
}
10201022
}
1021-
#endif
1023+
#endif // HAS_K_AXIS
10221024

10231025
#if HAS_U_AXIS
10241026
if (stepper.axis_is_moving(U_AXIS)) {
@@ -1033,7 +1035,7 @@ void Endstops::update() {
10331035
#endif
10341036
}
10351037
}
1036-
#endif
1038+
#endif // HAS_U_AXIS
10371039

10381040
#if HAS_V_AXIS
10391041
if (stepper.axis_is_moving(V_AXIS)) {
@@ -1048,7 +1050,7 @@ void Endstops::update() {
10481050
#endif
10491051
}
10501052
}
1051-
#endif
1053+
#endif // HAS_V_AXIS
10521054

10531055
#if HAS_W_AXIS
10541056
if (stepper.axis_is_moving(W_AXIS)) {
@@ -1063,7 +1065,7 @@ void Endstops::update() {
10631065
#endif
10641066
}
10651067
}
1066-
#endif
1068+
#endif // HAS_W_AXIS
10671069
} // Endstops::update()
10681070

10691071
#if ENABLED(SPI_ENDSTOPS)

‎Marlin/src/module/stepper.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -636,9 +636,9 @@ void Stepper::apply_directions() {
636636
}
637637
else {
638638
#if ENABLED(MIXING_EXTRUDER)
639-
MIXER_STEPPER_LOOP(j) NORM_E_DIR(j);
639+
MIXER_STEPPER_LOOP(j) FWD_E_DIR(j);
640640
#else
641-
NORM_E_DIR(stepper_extruder);
641+
FWD_E_DIR(stepper_extruder);
642642
#endif
643643
count_direction.e = 1;
644644
}
@@ -2420,9 +2420,9 @@ hal_timer_t Stepper::block_phase_isr() {
24202420
}
24212421
else {
24222422
#if ENABLED(MIXING_EXTRUDER)
2423-
MIXER_STEPPER_LOOP(j) NORM_E_DIR(j);
2423+
MIXER_STEPPER_LOOP(j) FWD_E_DIR(j);
24242424
#else
2425-
NORM_E_DIR(stepper_extruder);
2425+
FWD_E_DIR(stepper_extruder);
24262426
#endif
24272427
}
24282428

‎Marlin/src/module/stepper/indirection.h

+22-22
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
459459
#if HAS_SWITCHING_EXTRUDER // One stepper driver per two extruders, reversed on odd index
460460
#if EXTRUDERS > 7
461461
#define E_STEP_WRITE(E,V) do{ if (E < 2) { E0_STEP_WRITE(V); } else if (E < 4) { E1_STEP_WRITE(V); } else if (E < 6) { E2_STEP_WRITE(V); } else { E3_STEP_WRITE(V); } }while(0)
462-
#define NORM_E_DIR(E) do{ switch (E) { \
462+
#define FWD_E_DIR(E) do{ switch (E) { \
463463
case 0: E0_DIR_WRITE(INVERT_DIR(E0, HIGH)); break; case 1: E0_DIR_WRITE(INVERT_DIR(E0, LOW )); break; \
464464
case 2: E1_DIR_WRITE(INVERT_DIR(E1, HIGH)); break; case 3: E1_DIR_WRITE(INVERT_DIR(E1, LOW )); break; \
465465
case 4: E2_DIR_WRITE(INVERT_DIR(E2, HIGH)); break; case 5: E2_DIR_WRITE(INVERT_DIR(E2, LOW )); break; \
@@ -473,7 +473,7 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
473473
} }while(0)
474474
#elif EXTRUDERS > 6
475475
#define E_STEP_WRITE(E,V) do{ if (E < 2) { E0_STEP_WRITE(V); } else if (E < 4) { E1_STEP_WRITE(V); } else if (E < 6) { E2_STEP_WRITE(V); } else { E3_STEP_WRITE(V); } }while(0)
476-
#define NORM_E_DIR(E) do{ switch (E) { \
476+
#define FWD_E_DIR(E) do{ switch (E) { \
477477
case 0: E0_DIR_WRITE(INVERT_DIR(E0, HIGH)); break; case 1: E0_DIR_WRITE(INVERT_DIR(E0, LOW )); break; \
478478
case 2: E1_DIR_WRITE(INVERT_DIR(E1, HIGH)); break; case 3: E1_DIR_WRITE(INVERT_DIR(E1, LOW )); break; \
479479
case 4: E2_DIR_WRITE(INVERT_DIR(E2, HIGH)); break; case 5: E2_DIR_WRITE(INVERT_DIR(E2, LOW )); break; \
@@ -486,7 +486,7 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
486486
case 6: E3_DIR_WRITE(INVERT_DIR(E3, LOW )); } }while(0)
487487
#elif EXTRUDERS > 5
488488
#define E_STEP_WRITE(E,V) do{ if (E < 2) { E0_STEP_WRITE(V); } else if (E < 4) { E1_STEP_WRITE(V); } else { E2_STEP_WRITE(V); } }while(0)
489-
#define NORM_E_DIR(E) do{ switch (E) { \
489+
#define FWD_E_DIR(E) do{ switch (E) { \
490490
case 0: E0_DIR_WRITE(INVERT_DIR(E0, HIGH)); break; case 1: E0_DIR_WRITE(INVERT_DIR(E0, LOW )); break; \
491491
case 2: E1_DIR_WRITE(INVERT_DIR(E1, HIGH)); break; case 3: E1_DIR_WRITE(INVERT_DIR(E1, LOW )); break; \
492492
case 4: E2_DIR_WRITE(INVERT_DIR(E2, HIGH)); break; case 5: E2_DIR_WRITE(INVERT_DIR(E2, LOW )); break; \
@@ -498,7 +498,7 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
498498
} }while(0)
499499
#elif EXTRUDERS > 4
500500
#define E_STEP_WRITE(E,V) do{ if (E < 2) { E0_STEP_WRITE(V); } else if (E < 4) { E1_STEP_WRITE(V); } else { E2_STEP_WRITE(V); } }while(0)
501-
#define NORM_E_DIR(E) do{ switch (E) { \
501+
#define FWD_E_DIR(E) do{ switch (E) { \
502502
case 0: E0_DIR_WRITE(INVERT_DIR(E0, HIGH)); break; case 1: E0_DIR_WRITE(INVERT_DIR(E0, LOW )); break; \
503503
case 2: E1_DIR_WRITE(INVERT_DIR(E1, HIGH)); break; case 3: E1_DIR_WRITE(INVERT_DIR(E1, LOW )); break; \
504504
case 4: E2_DIR_WRITE(INVERT_DIR(E2, HIGH)); break; \
@@ -510,7 +510,7 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
510510
} }while(0)
511511
#elif EXTRUDERS > 3
512512
#define E_STEP_WRITE(E,V) do{ if (E < 2) { E0_STEP_WRITE(V); } else { E1_STEP_WRITE(V); } }while(0)
513-
#define NORM_E_DIR(E) do{ switch (E) { \
513+
#define FWD_E_DIR(E) do{ switch (E) { \
514514
case 0: E0_DIR_WRITE(INVERT_DIR(E0, HIGH)); break; case 1: E0_DIR_WRITE(INVERT_DIR(E0, LOW )); break; \
515515
case 2: E1_DIR_WRITE(INVERT_DIR(E1, HIGH)); break; case 3: E1_DIR_WRITE(INVERT_DIR(E1, LOW )); break; \
516516
} }while(0)
@@ -520,7 +520,7 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
520520
} }while(0)
521521
#elif EXTRUDERS > 2
522522
#define E_STEP_WRITE(E,V) do{ if (E < 2) { E0_STEP_WRITE(V); } else { E1_STEP_WRITE(V); } }while(0)
523-
#define NORM_E_DIR(E) do{ switch (E) { \
523+
#define FWD_E_DIR(E) do{ switch (E) { \
524524
case 0: E0_DIR_WRITE(INVERT_DIR(E0, HIGH)); break; case 1: E0_DIR_WRITE(INVERT_DIR(E0, LOW )); break; \
525525
case 2: E1_DIR_WRITE(INVERT_DIR(E1, HIGH)); break; \
526526
} }while(0)
@@ -530,20 +530,20 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
530530
} }while(0)
531531
#else
532532
#define E_STEP_WRITE(E,V) E0_STEP_WRITE(V)
533-
#define NORM_E_DIR(E) do{ E0_DIR_WRITE(INVERT_DIR(E0, (E) ? LOW : HIGH)); }while(0)
533+
#define FWD_E_DIR(E) do{ E0_DIR_WRITE(INVERT_DIR(E0, (E) ? LOW : HIGH)); }while(0)
534534
#define REV_E_DIR(E) do{ E0_DIR_WRITE(INVERT_DIR(E0, (E) ? HIGH : LOW )); }while(0)
535535
#endif
536536

537537
#elif HAS_PRUSA_MMU2 // One multiplexed stepper driver
538538

539539
#define E_STEP_WRITE(E,V) E0_STEP_WRITE(V)
540-
#define NORM_E_DIR(E) E0_DIR_WRITE(INVERT_DIR(E0, HIGH))
540+
#define FWD_E_DIR(E) E0_DIR_WRITE(INVERT_DIR(E0, HIGH))
541541
#define REV_E_DIR(E) E0_DIR_WRITE(INVERT_DIR(E0, LOW ))
542542

543543
#elif HAS_PRUSA_MMU1 // One multiplexed stepper driver, reversed on odd index
544544

545545
#define E_STEP_WRITE(E,V) E0_STEP_WRITE(V)
546-
#define NORM_E_DIR(E) do{ E0_DIR_WRITE(INVERT_DIR(E0, TEST(E, 0) ? HIGH : LOW )); }while(0)
546+
#define FWD_E_DIR(E) do{ E0_DIR_WRITE(INVERT_DIR(E0, TEST(E, 0) ? HIGH : LOW )); }while(0)
547547
#define REV_E_DIR(E) do{ E0_DIR_WRITE(INVERT_DIR(E0, TEST(E, 0) ? LOW : HIGH)); }while(0)
548548

549549
#elif E_STEPPERS > 1
@@ -554,7 +554,7 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
554554
case 0: E0_STEP_WRITE(V); break; case 1: E1_STEP_WRITE(V); break; case 2: E2_STEP_WRITE(V); break; case 3: E3_STEP_WRITE(V); break; \
555555
case 4: E4_STEP_WRITE(V); break; case 5: E5_STEP_WRITE(V); break; case 6: E6_STEP_WRITE(V); break; case 7: E7_STEP_WRITE(V); break; \
556556
} }while(0)
557-
#define _NORM_E_DIR(E) do{ switch (E) { \
557+
#define _FWD_E_DIR(E) do{ switch (E) { \
558558
case 0: E0_DIR_WRITE(INVERT_DIR(E0, HIGH)); break; case 1: E1_DIR_WRITE(INVERT_DIR(E1, HIGH)); break; \
559559
case 2: E2_DIR_WRITE(INVERT_DIR(E2, HIGH)); break; case 3: E3_DIR_WRITE(INVERT_DIR(E3, HIGH)); break; \
560560
case 4: E4_DIR_WRITE(INVERT_DIR(E4, HIGH)); break; case 5: E5_DIR_WRITE(INVERT_DIR(E5, HIGH)); break; \
@@ -573,7 +573,7 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
573573
case 0: E0_STEP_WRITE(V); break; case 1: E1_STEP_WRITE(V); break; case 2: E2_STEP_WRITE(V); break; case 3: E3_STEP_WRITE(V); break; \
574574
case 4: E4_STEP_WRITE(V); break; case 5: E5_STEP_WRITE(V); break; case 6: E6_STEP_WRITE(V); break; \
575575
} }while(0)
576-
#define _NORM_E_DIR(E) do{ switch (E) { \
576+
#define _FWD_E_DIR(E) do{ switch (E) { \
577577
case 0: E0_DIR_WRITE(INVERT_DIR(E0, HIGH)); break; case 1: E1_DIR_WRITE(INVERT_DIR(E1, HIGH)); break; \
578578
case 2: E2_DIR_WRITE(INVERT_DIR(E2, HIGH)); break; case 3: E3_DIR_WRITE(INVERT_DIR(E3, HIGH)); break; \
579579
case 4: E4_DIR_WRITE(INVERT_DIR(E4, HIGH)); break; case 5: E5_DIR_WRITE(INVERT_DIR(E5, HIGH)); break; \
@@ -592,7 +592,7 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
592592
case 0: E0_STEP_WRITE(V); break; case 1: E1_STEP_WRITE(V); break; case 2: E2_STEP_WRITE(V); break; case 3: E3_STEP_WRITE(V); break; \
593593
case 4: E4_STEP_WRITE(V); break; case 5: E5_STEP_WRITE(V); break; \
594594
} }while(0)
595-
#define _NORM_E_DIR(E) do{ switch (E) { \
595+
#define _FWD_E_DIR(E) do{ switch (E) { \
596596
case 0: E0_DIR_WRITE(INVERT_DIR(E0, HIGH)); break; case 1: E1_DIR_WRITE(INVERT_DIR(E1, HIGH)); break; \
597597
case 2: E2_DIR_WRITE(INVERT_DIR(E2, HIGH)); break; case 3: E3_DIR_WRITE(INVERT_DIR(E3, HIGH)); break; \
598598
case 4: E4_DIR_WRITE(INVERT_DIR(E4, HIGH)); break; case 5: E5_DIR_WRITE(INVERT_DIR(E5, HIGH)); break; \
@@ -609,7 +609,7 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
609609
case 0: E0_STEP_WRITE(V); break; case 1: E1_STEP_WRITE(V); break; case 2: E2_STEP_WRITE(V); break; case 3: E3_STEP_WRITE(V); break; \
610610
case 4: E4_STEP_WRITE(V); break; \
611611
} }while(0)
612-
#define _NORM_E_DIR(E) do{ switch (E) { \
612+
#define _FWD_E_DIR(E) do{ switch (E) { \
613613
case 0: E0_DIR_WRITE(INVERT_DIR(E0, HIGH)); break; case 1: E1_DIR_WRITE(INVERT_DIR(E1, HIGH)); break; \
614614
case 2: E2_DIR_WRITE(INVERT_DIR(E2, HIGH)); break; case 3: E3_DIR_WRITE(INVERT_DIR(E3, HIGH)); break; \
615615
case 4: E4_DIR_WRITE(INVERT_DIR(E4, HIGH)); break; \
@@ -625,7 +625,7 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
625625
#define _E_STEP_WRITE(E,V) do{ switch (E) { \
626626
case 0: E0_STEP_WRITE(V); break; case 1: E1_STEP_WRITE(V); break; case 2: E2_STEP_WRITE(V); break; case 3: E3_STEP_WRITE(V); break; \
627627
} }while(0)
628-
#define _NORM_E_DIR(E) do{ switch (E) { \
628+
#define _FWD_E_DIR(E) do{ switch (E) { \
629629
case 0: E0_DIR_WRITE(INVERT_DIR(E0, HIGH)); break; case 1: E1_DIR_WRITE(INVERT_DIR(E1, HIGH)); break; \
630630
case 2: E2_DIR_WRITE(INVERT_DIR(E2, HIGH)); break; case 3: E3_DIR_WRITE(INVERT_DIR(E3, HIGH)); break; \
631631
} }while(0)
@@ -637,13 +637,13 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
637637
#elif E_STEPPERS > 2
638638

639639
#define _E_STEP_WRITE(E,V) do{ switch (E) { case 0: E0_STEP_WRITE(V); break; case 1: E1_STEP_WRITE(V); break; case 2: E2_STEP_WRITE(V); } }while(0)
640-
#define _NORM_E_DIR(E) do{ switch (E) { case 0: E0_DIR_WRITE(INVERT_DIR(E0, HIGH)); break; case 1: E1_DIR_WRITE(INVERT_DIR(E1, HIGH)); break; case 2: E2_DIR_WRITE(INVERT_DIR(E2, HIGH)); } }while(0)
640+
#define _FWD_E_DIR(E) do{ switch (E) { case 0: E0_DIR_WRITE(INVERT_DIR(E0, HIGH)); break; case 1: E1_DIR_WRITE(INVERT_DIR(E1, HIGH)); break; case 2: E2_DIR_WRITE(INVERT_DIR(E2, HIGH)); } }while(0)
641641
#define _REV_E_DIR(E) do{ switch (E) { case 0: E0_DIR_WRITE(INVERT_DIR(E0, LOW )); break; case 1: E1_DIR_WRITE(INVERT_DIR(E1, LOW )); break; case 2: E2_DIR_WRITE(INVERT_DIR(E2, LOW )); } }while(0)
642642

643643
#else
644644

645645
#define _E_STEP_WRITE(E,V) do{ if (E == 0) { E0_STEP_WRITE(V); } else { E1_STEP_WRITE(V); } }while(0)
646-
#define _NORM_E_DIR(E) do{ if (E == 0) { E0_DIR_WRITE(INVERT_DIR(E0, HIGH)); } else { E1_DIR_WRITE(INVERT_DIR(E1, HIGH)); } }while(0)
646+
#define _FWD_E_DIR(E) do{ if (E == 0) { E0_DIR_WRITE(INVERT_DIR(E0, HIGH)); } else { E1_DIR_WRITE(INVERT_DIR(E1, HIGH)); } }while(0)
647647
#define _REV_E_DIR(E) do{ if (E == 0) { E0_DIR_WRITE(INVERT_DIR(E0, LOW )); } else { E1_DIR_WRITE(INVERT_DIR(E1, LOW )); } }while(0)
648648
#endif
649649

@@ -659,30 +659,30 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
659659
#define RDIR(N) DUPE(N,DIR,INVERT_DIR(E, LOW ));
660660

661661
#define E_STEP_WRITE(E,V) do{ if (extruder_duplication_enabled) { REPEAT2(E_STEPPERS, DUPE, STEP, V); } else _E_STEP_WRITE(E,V); }while(0)
662-
#define NORM_E_DIR(E) do{ if (extruder_duplication_enabled) { REPEAT(E_STEPPERS, NDIR); } else _NORM_E_DIR(E); }while(0)
663-
#define REV_E_DIR(E) do{ if (extruder_duplication_enabled) { REPEAT(E_STEPPERS, RDIR); } else _REV_E_DIR(E); }while(0)
662+
#define FWD_E_DIR(E) do{ if (extruder_duplication_enabled) { REPEAT(E_STEPPERS, NDIR); } else _FWD_E_DIR(E); }while(0)
663+
#define REV_E_DIR(E) do{ if (extruder_duplication_enabled) { REPEAT(E_STEPPERS, RDIR); } else _REV_E_DIR(E); }while(0)
664664

665665
#else
666666

667667
#define E_STEP_WRITE(E,V) _E_STEP_WRITE(E,V)
668-
#define NORM_E_DIR(E) _NORM_E_DIR(E)
668+
#define FWD_E_DIR(E) _FWD_E_DIR(E)
669669
#define REV_E_DIR(E) _REV_E_DIR(E)
670670

671671
#endif
672672

673673
#elif ENABLED(E_DUAL_STEPPER_DRIVERS)
674674
#define E_STEP_WRITE(E,V) do{ E0_STEP_WRITE(V); E1_STEP_WRITE(V); }while(0)
675-
#define NORM_E_DIR(E) do{ constexpr bool d = INVERT_DIR(E0, HIGH); E0_DIR_WRITE(d); E1_DIR_WRITE(INVERT_DIR(E1_VS_E0, d)); }while(0)
675+
#define FWD_E_DIR(E) do{ constexpr bool d = INVERT_DIR(E0, HIGH); E0_DIR_WRITE(d); E1_DIR_WRITE(INVERT_DIR(E1_VS_E0, d)); }while(0)
676676
#define REV_E_DIR(E) do{ constexpr bool d = INVERT_DIR(E0, LOW ); E0_DIR_WRITE(d); E1_DIR_WRITE(INVERT_DIR(E1_VS_E0, d)); }while(0)
677677

678678
#elif E_STEPPERS
679679
#define E_STEP_WRITE(E,V) E0_STEP_WRITE(V)
680-
#define NORM_E_DIR(E) E0_DIR_WRITE(INVERT_DIR(E0, HIGH))
680+
#define FWD_E_DIR(E) E0_DIR_WRITE(INVERT_DIR(E0, HIGH))
681681
#define REV_E_DIR(E) E0_DIR_WRITE(INVERT_DIR(E0, LOW ))
682682

683683
#else
684684
#define E_STEP_WRITE(E,V) NOOP
685-
#define NORM_E_DIR(E) NOOP
685+
#define FWD_E_DIR(E) NOOP
686686
#define REV_E_DIR(E) NOOP
687687

688688
#endif

0 commit comments

Comments
 (0)