From 8291ae34f2175c0234ff2d2b25b94dd21a514e69 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 6 Mar 2018 19:00:38 -0600
Subject: [PATCH] Support duplication mode in LIN_ADVANCE
---
Marlin/src/module/stepper.cpp | 32 +++++++++++++++-----------------
1 file changed, 15 insertions(+), 17 deletions(-)
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index bf4aa41186..1df10ea759 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -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) {
@@ -793,7 +791,7 @@ void Stepper::isr() {
else
nextAdvanceISR = ADV_NEVER;
- switch(LA_active_extruder) {
+ switch (LA_active_extruder) {
case 0: SET_E_STEP_DIR(0); break;
#if EXTRUDERS > 1
case 1: SET_E_STEP_DIR(1); break;
@@ -816,7 +814,7 @@ void Stepper::isr() {
hal_timer_t pulse_start = HAL_timer_get_count(PULSE_TIMER_NUM);
#endif
- switch(LA_active_extruder) {
+ switch (LA_active_extruder) {
case 0: START_E_PULSE(0); break;
#if EXTRUDERS > 1
case 1: START_E_PULSE(1); break;
@@ -840,7 +838,7 @@ void Stepper::isr() {
DELAY_NOPS(EXTRA_CYCLES_E);
#endif
- switch(LA_active_extruder) {
+ switch (LA_active_extruder) {
case 0: STOP_E_PULSE(0); break;
#if EXTRUDERS > 1
case 1: STOP_E_PULSE(1); break;
--
GitLab