|
|
@ -755,23 +755,21 @@ void Stepper::isr() { |
|
|
|
|
|
|
|
void Stepper::advance_isr() { |
|
|
|
|
|
|
|
#if ENABLED(MK2_MULTIPLEXER) |
|
|
|
// Even-numbered steppers are reversed
|
|
|
|
#define SET_E_STEP_DIR(INDEX) \ |
|
|
|
if (e_steps) E## INDEX ##_DIR_WRITE(e_steps < 0 ? !INVERT_E## INDEX ##_DIR ^ TEST(INDEX, 0) : INVERT_E## INDEX ##_DIR ^ TEST(INDEX, 0)) |
|
|
|
#if ENABLED(MK2_MULTIPLEXER) // For SNMM even-numbered steppers are reversed
|
|
|
|
#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) |
|
|
|
#elif ENABLED(DUAL_X_CARRIAGE) || ENABLED(DUAL_NOZZLE_DUPLICATION_MODE) |
|
|
|
#define SET_E_STEP_DIR(INDEX) do{ if (e_steps) { e_steps < 0 ? REV_E_DIR() : NORM_E_DIR(); } }while(0) |
|
|
|
#else |
|
|
|
#define SET_E_STEP_DIR(INDEX) \ |
|
|
|
if (e_steps) E## INDEX ##_DIR_WRITE(e_steps < 0 ? INVERT_E## INDEX ##_DIR : !INVERT_E## INDEX ##_DIR) |
|
|
|
#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) |
|
|
|
#endif |
|
|
|
|
|
|
|
#define START_E_PULSE(INDEX) \ |
|
|
|
if (e_steps) E## INDEX ##_STEP_WRITE(!INVERT_E_STEP_PIN) |
|
|
|
|
|
|
|
#define STOP_E_PULSE(INDEX) \ |
|
|
|
if (e_steps) { \ |
|
|
|
e_steps < 0 ? ++e_steps : --e_steps; \ |
|
|
|
E## INDEX ##_STEP_WRITE(INVERT_E_STEP_PIN); \ |
|
|
|
} |
|
|
|
#if ENABLED(DUAL_X_CARRIAGE) || ENABLED(DUAL_NOZZLE_DUPLICATION_MODE) |
|
|
|
#define START_E_PULSE(INDEX) do{ if (e_steps) E_STEP_WRITE(!INVERT_E_STEP_PIN); }while(0) |
|
|
|
#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) |
|
|
|
#else |
|
|
|
#define START_E_PULSE(INDEX) do{ if (e_steps) E## INDEX ##_STEP_WRITE(!INVERT_E_STEP_PIN); }while(0) |
|
|
|
#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) |
|
|
|
#endif |
|
|
|
|
|
|
|
if (current_block->use_advance_lead) { |
|
|
|
if (step_events_completed > LA_decelerate_after && current_adv_steps > final_adv_steps) { |
|
|
|