3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor reformatting

Browse source
This commit is contained in:
Yuri D'Elia 2019-05-19 14:34:03 +02:00
parent 9586d71adb
commit 942c38c18b
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Firmware/planner.cpp
View file

@ -1019,21 +1019,23 @@ Having the real displacement of the head, we can calculate the total movement le
/** /**
* Use LIN_ADVANCE for blocks if all these are true: * Use LIN_ADVANCE for blocks if all these are true:
* *
* block->steps_e : This is a print move, because we checked for X, Y, Z steps before. * block->steps_e : This is a print move, because we checked for X, Y, Z steps before.
* extruder_advance_K : There is an advance factor set. * extruder_advance_K : There is an advance factor set.
* delta_mm[E_AXIS] > 0 : Extruder is running forward (e.g., for "Wipe while retracting" (Slic3r) or "Combing" (Cura) moves) * delta_mm[E_AXIS] > 0 : Extruder is running forward (e.g., for "Wipe while retracting" (Slic3r) or "Combing" (Cura) moves)
*/ */
block->use_advance_lead = block->steps_e.wide block->use_advance_lead = block->steps_e.wide
&& extruder_advance_K && extruder_advance_K
&& delta_mm[E_AXIS] > 0; && delta_mm[E_AXIS] > 0;
if (block->use_advance_lead) { if (block->use_advance_lead) {
block->e_D_ratio = (e - position_float[E_AXIS]) / block->e_D_ratio = (e - position_float[E_AXIS]) /
sqrt(sq(x - position_float[X_AXIS]) sqrt(sq(x - position_float[X_AXIS])
+ sq(y - position_float[Y_AXIS]) + sq(y - position_float[Y_AXIS])
+ sq(z - position_float[Z_AXIS])); + sq(z - position_float[Z_AXIS]));
// Check for unusual high e_D ratio to detect if a retract move was combined with the last print move due to min. steps per segment. Never execute this with advance! // Check for unusual high e_D ratio to detect if a retract move was combined with the last
// This assumes no one will use a retract length of 0mm < retr_length < ~0.2mm and no one will print 100mm wide lines using 3mm filament or 35mm wide lines using 1.75mm filament. // print move due to min. steps per segment. Never execute this with advance! This assumes
// no one will use a retract length of 0mm < retr_length < ~0.2mm and no one will print
// 100mm wide lines using 3mm filament or 35mm wide lines using 1.75mm filament.
if (block->e_D_ratio > 3.0) if (block->e_D_ratio > 3.0)
block->use_advance_lead = false; block->use_advance_lead = false;
else { else {

2
Firmware/planner.h
View file

@ -113,7 +113,7 @@ typedef struct {
#ifdef LIN_ADVANCE #ifdef LIN_ADVANCE
bool use_advance_lead; // Whether the current block uses LA bool use_advance_lead; // Whether the current block uses LA
uint16_t advance_rate, // Step-rate for extruder speed uint16_t advance_rate, // Step-rate for extruder speed
max_adv_steps, // max. advance steps to get cruising speed pressure (not always nominal_speed!) max_adv_steps, // max. advance steps to get cruising speed pressure (not always nominal_speed!)
final_adv_steps; // advance steps due to exit speed final_adv_steps; // advance steps due to exit speed
uint8_t advance_step_loops; // Number of stepper ticks for each advance isr uint8_t advance_step_loops; // Number of stepper ticks for each advance isr