SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

LIN_ADVANCE single stepper optimization

Browse source
This commit is contained in:
Scott Lahteine 2018-03-06 19:21:41 -06:00
parent 8291ae34f2
commit ca0def766e
2 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Marlin/src/module/stepper.cpp
View file

@ -122,8 +122,13 @@ volatile uint32_t Stepper::step_events_completed = 0; // The number of step even
Stepper::final_adv_steps, Stepper::final_adv_steps,
Stepper::max_adv_steps; Stepper::max_adv_steps;
int8_t Stepper::e_steps = 0, 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".
#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; bool Stepper::use_advance_lead;

21
Marlin/src/module/stepper.h
View file

@ -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". 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 #define _NEXT_ISR(T) nextMainISR = T
static int8_t e_steps; 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; 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 #else // !LIN_ADVANCE
@ -352,19 +356,18 @@ class Stepper {
static int8_t last_extruder = -1; static int8_t last_extruder = -1;
#if ENABLED(LIN_ADVANCE) #if ENABLED(LIN_ADVANCE)
if (current_block->active_extruder != last_extruder) { #if E_STEPPERS > 1
current_adv_steps = 0; // If the now active extruder wasn't in use during the last move, its pressure is most likely gone. if (current_block->active_extruder != last_extruder) {
LA_active_extruder = current_block->active_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; LA_decelerate_after = current_block->decelerate_after;
final_adv_steps = current_block->final_adv_steps; final_adv_steps = current_block->final_adv_steps;
max_adv_steps = current_block->max_adv_steps; max_adv_steps = current_block->max_adv_steps;
use_advance_lead = true;
} }
else
use_advance_lead = false;
#endif #endif
if (current_block->direction_bits != last_direction_bits || current_block->active_extruder != last_extruder) { if (current_block->direction_bits != last_direction_bits || current_block->active_extruder != last_extruder) {