josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Planner: use the correct block when updating LA factors

This commit is contained in:
Yuri D'Elia 2019-05-18 18:03:20 +02:00
parent 3b528196dd
commit 2c8e04bd5f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Firmware/planner.cpp
View File

@ -402,10 +402,10 @@ void planner_recalculate(const float &safe_final_speed)
// NOTE: Entry and exit factors always > 0 by all previous logic operations. // NOTE: Entry and exit factors always > 0 by all previous logic operations.
calculate_trapezoid_for_block(prev, prev->entry_speed, current->entry_speed); calculate_trapezoid_for_block(prev, prev->entry_speed, current->entry_speed);
#ifdef LIN_ADVANCE #ifdef LIN_ADVANCE
if (current->use_advance_lead) { if (prev->use_advance_lead) {
const float comp = current->e_D_ratio * extruder_advance_K * cs.axis_steps_per_unit[E_AXIS]; const float comp = prev->e_D_ratio * extruder_advance_K * cs.axis_steps_per_unit[E_AXIS];
current->max_adv_steps = current->nominal_speed * comp; prev->max_adv_steps = prev->nominal_speed * comp;
current->final_adv_steps = next->entry_speed * comp; prev->final_adv_steps = current->entry_speed * comp;
} }
#endif #endif
// Reset current only to ensure next trapezoid is computed. // Reset current only to ensure next trapezoid is computed.