|
@@ -755,23 +755,21 @@ void Stepper::isr() {
|
755
|
755
|
|
756
|
756
|
void Stepper::advance_isr() {
|
757
|
757
|
|
758
|
|
- #if ENABLED(MK2_MULTIPLEXER)
|
759
|
|
- // Even-numbered steppers are reversed
|
760
|
|
- #define SET_E_STEP_DIR(INDEX) \
|
761
|
|
- if (e_steps) E## INDEX ##_DIR_WRITE(e_steps < 0 ? !INVERT_E## INDEX ##_DIR ^ TEST(INDEX, 0) : INVERT_E## INDEX ##_DIR ^ TEST(INDEX, 0))
|
|
758
|
+ #if ENABLED(MK2_MULTIPLEXER) // For SNMM even-numbered steppers are reversed
|
|
759
|
+ #define SET_E_STEP_DIR(INDEX) do{ if (e_steps) E## INDEX ##_DIR_WRITE(e_steps < 0 ? !INVERT_E## INDEX ##_DIR ^ TEST(INDEX, 0) : INVERT_E## INDEX ##_DIR ^ TEST(INDEX, 0)); }while(0)
|
|
760
|
+ #elif ENABLED(DUAL_X_CARRIAGE) || ENABLED(DUAL_NOZZLE_DUPLICATION_MODE)
|
|
761
|
+ #define SET_E_STEP_DIR(INDEX) do{ if (e_steps) { e_steps < 0 ? REV_E_DIR() : NORM_E_DIR(); } }while(0)
|
762
|
762
|
#else
|
763
|
|
- #define SET_E_STEP_DIR(INDEX) \
|
764
|
|
- if (e_steps) E## INDEX ##_DIR_WRITE(e_steps < 0 ? INVERT_E## INDEX ##_DIR : !INVERT_E## INDEX ##_DIR)
|
|
763
|
+ #define SET_E_STEP_DIR(INDEX) do{ if (e_steps) E## INDEX ##_DIR_WRITE(e_steps < 0 ? INVERT_E## INDEX ##_DIR : !INVERT_E## INDEX ##_DIR); }while(0)
|
765
|
764
|
#endif
|
766
|
765
|
|
767
|
|
- #define START_E_PULSE(INDEX) \
|
768
|
|
- if (e_steps) E## INDEX ##_STEP_WRITE(!INVERT_E_STEP_PIN)
|
769
|
|
-
|
770
|
|
- #define STOP_E_PULSE(INDEX) \
|
771
|
|
- if (e_steps) { \
|
772
|
|
- e_steps < 0 ? ++e_steps : --e_steps; \
|
773
|
|
- E## INDEX ##_STEP_WRITE(INVERT_E_STEP_PIN); \
|
774
|
|
- }
|
|
766
|
+ #if ENABLED(DUAL_X_CARRIAGE) || ENABLED(DUAL_NOZZLE_DUPLICATION_MODE)
|
|
767
|
+ #define START_E_PULSE(INDEX) do{ if (e_steps) E_STEP_WRITE(!INVERT_E_STEP_PIN); }while(0)
|
|
768
|
+ #define STOP_E_PULSE(INDEX) do{ if (e_steps) { E_STEP_WRITE(INVERT_E_STEP_PIN); e_steps < 0 ? ++e_steps : --e_steps; } }while(0)
|
|
769
|
+ #else
|
|
770
|
+ #define START_E_PULSE(INDEX) do{ if (e_steps) E## INDEX ##_STEP_WRITE(!INVERT_E_STEP_PIN); }while(0)
|
|
771
|
+ #define STOP_E_PULSE(INDEX) do { if (e_steps) { E## INDEX ##_STEP_WRITE(INVERT_E_STEP_PIN); e_steps < 0 ? ++e_steps : --e_steps; } }while(0)
|
|
772
|
+ #endif
|
775
|
773
|
|
776
|
774
|
if (current_block->use_advance_lead) {
|
777
|
775
|
if (step_events_completed > LA_decelerate_after && current_adv_steps > final_adv_steps) {
|
|
@@ -793,7 +791,7 @@ void Stepper::isr() {
|
793
|
791
|
else
|
794
|
792
|
nextAdvanceISR = ADV_NEVER;
|
795
|
793
|
|
796
|
|
- switch(LA_active_extruder) {
|
|
794
|
+ switch (LA_active_extruder) {
|
797
|
795
|
case 0: SET_E_STEP_DIR(0); break;
|
798
|
796
|
#if EXTRUDERS > 1
|
799
|
797
|
case 1: SET_E_STEP_DIR(1); break;
|
|
@@ -816,7 +814,7 @@ void Stepper::isr() {
|
816
|
814
|
hal_timer_t pulse_start = HAL_timer_get_count(PULSE_TIMER_NUM);
|
817
|
815
|
#endif
|
818
|
816
|
|
819
|
|
- switch(LA_active_extruder) {
|
|
817
|
+ switch (LA_active_extruder) {
|
820
|
818
|
case 0: START_E_PULSE(0); break;
|
821
|
819
|
#if EXTRUDERS > 1
|
822
|
820
|
case 1: START_E_PULSE(1); break;
|
|
@@ -840,7 +838,7 @@ void Stepper::isr() {
|
840
|
838
|
DELAY_NOPS(EXTRA_CYCLES_E);
|
841
|
839
|
#endif
|
842
|
840
|
|
843
|
|
- switch(LA_active_extruder) {
|
|
841
|
+ switch (LA_active_extruder) {
|
844
|
842
|
case 0: STOP_E_PULSE(0); break;
|
845
|
843
|
#if EXTRUDERS > 1
|
846
|
844
|
case 1: STOP_E_PULSE(1); break;
|