felix/Marlin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[1.1.x] LIN_ADVANCE v1.5 (#9700)

Browse Source
This commit is contained in:
Sebastianv650
2018-02-23 07:53:41 +01:00
committed by Scott Lahteine
parent e41b2274b0
commit 9c65890644
45 changed files with 774 additions and 1429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Marlin/stepper.h
View File

@@ -123,14 +123,14 @@ class Stepper {
#if ENABLED(LIN_ADVANCE)
static uint16_t nextMainISR, nextAdvanceISR, eISR_Rate;
static uint32_t LA_decelerate_after; // Copy from current executed block. Needed because current_block is set to NULL "too early".
static uint16_t nextMainISR, nextAdvanceISR, eISR_Rate, 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 volatile int e_steps[E_STEPPERS];
static int final_estep_rate;
static int current_estep_rate[E_STEPPERS]; // Actual extruder speed [steps/s]
static int current_adv_steps[E_STEPPERS]; // The amount of current added esteps due to advance.
// i.e., the current amount of pressure applied
// to the spring (=filament).
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;
#else // !LIN_ADVANCE
#define _NEXT_ISR(T) OCR1A = T
@@ -348,6 +348,22 @@ 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 (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) {
last_direction_bits = current_block->direction_bits;
last_extruder = current_block->active_extruder;
@@ -363,22 +379,6 @@ class Stepper {
acceleration_time = calc_timer_interval(acc_step_rate);
_NEXT_ISR(acceleration_time);
#if ENABLED(LIN_ADVANCE)
if (current_block->use_advance_lead) {
current_estep_rate[current_block->active_extruder] = ((unsigned long)acc_step_rate * current_block->abs_adv_steps_multiplier8) >> 17;
final_estep_rate = (current_block->nominal_rate * current_block->abs_adv_steps_multiplier8) >> 17;
}
#endif
// SERIAL_ECHO_START();
// SERIAL_ECHOPGM("advance :");
// SERIAL_ECHO(current_block->advance/256.0);
// SERIAL_ECHOPGM("advance rate :");
// SERIAL_ECHO(current_block->advance_rate/256.0);
// SERIAL_ECHOPGM("initial advance :");
// SERIAL_ECHO(current_block->initial_advance/256.0);
// SERIAL_ECHOPGM("final advance :");
// SERIAL_ECHOLN(current_block->final_advance/256.0);
}
#if HAS_DIGIPOTSS || HAS_MOTOR_CURRENT_PWM