From ca0def766e3b5bfc3710835cd9cfe7c1cdfb9c89 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 6 Mar 2018 19:21:41 -0600 Subject: [PATCH] LIN_ADVANCE single stepper optimization --- Marlin/src/module/stepper.cpp | 9 +++++++-- Marlin/src/module/stepper.h | 21 ++++++++++++--------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp index 1df10ea75..fd4a3c3b5 100644 --- a/Marlin/src/module/stepper.cpp +++ b/Marlin/src/module/stepper.cpp @@ -122,8 +122,13 @@ volatile uint32_t Stepper::step_events_completed = 0; // The number of step even Stepper::final_adv_steps, Stepper::max_adv_steps; - int8_t Stepper::e_steps = 0, - Stepper::LA_active_extruder; // Copy from current executed block. Needed because current_block is set to NULL "too early". + int8_t Stepper::e_steps = 0; + + #if E_STEPPERS > 1 + int8_t Stepper::LA_active_extruder; // Copy from current executed block. Needed because current_block is set to NULL "too early". + #else + constexpr int8_t Stepper::LA_active_extruder; + #endif bool Stepper::use_advance_lead; diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h index e976c3692..28bf1ee89 100644 --- a/Marlin/src/module/stepper.h +++ b/Marlin/src/module/stepper.h @@ -104,8 +104,12 @@ class Stepper { static uint16_t current_adv_steps, final_adv_steps, max_adv_steps; // Copy from current executed block. Needed because current_block is set to NULL "too early". #define _NEXT_ISR(T) nextMainISR = T static int8_t e_steps; - static int8_t LA_active_extruder; // Copy from current executed block. Needed because current_block is set to NULL "too early". static bool use_advance_lead; + #if E_STEPPERS > 1 + static int8_t LA_active_extruder; // Copy from current executed block. Needed because current_block is set to NULL "too early". + #else + constexpr int8_t LA_active_extruder = 0; + #endif #else // !LIN_ADVANCE @@ -352,19 +356,18 @@ class Stepper { static int8_t last_extruder = -1; #if ENABLED(LIN_ADVANCE) - if (current_block->active_extruder != last_extruder) { - current_adv_steps = 0; // If the now active extruder wasn't in use during the last move, its pressure is most likely gone. - LA_active_extruder = current_block->active_extruder; - } + #if E_STEPPERS > 1 + if (current_block->active_extruder != last_extruder) { + current_adv_steps = 0; // If the now active extruder wasn't in use during the last move, its pressure is most likely gone. + LA_active_extruder = current_block->active_extruder; + } + #endif - if (current_block->use_advance_lead) { + if ((use_advance_lead = current_block->use_advance_lead)) { LA_decelerate_after = current_block->decelerate_after; final_adv_steps = current_block->final_adv_steps; max_adv_steps = current_block->max_adv_steps; - use_advance_lead = true; } - else - use_advance_lead = false; #endif if (current_block->direction_bits != last_direction_bits || current_block->active_extruder != last_extruder) {