toolhead: Change variables to use suffix "_v2" instead of prefix "junction_"

The junction speeds are tracked in velocity squared - introduce the
common suffix "_v2" to track that instead of using a prefix of
"junction_".

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor
2017-01-14 13:35:27 -05:00
parent 064e8bdd84
commit fc6a31eac8
2 changed files with 42 additions and 46 deletions

View File

@@ -83,12 +83,12 @@ class PrinterExtruder:
prev_pressure_d += extra_accel_d
# Update decel and retract parameters when decelerating
if decel_t:
if move.corner_min:
npd = move.corner_max*move_extrude_r * self.pressure_advance
if move.min_corner_v:
npd = move.max_corner_v*move_extrude_r*self.pressure_advance
extra_decel_d = prev_pressure_d - npd
if move.end_v > move.corner_min:
if move.end_v > move.min_corner_v:
extra_decel_d *= ((move.cruise_v - move.end_v)
/ (move.cruise_v - move.corner_min))
/ (move.cruise_v - move.min_corner_v))
else:
npd = move.end_v * move_extrude_r * self.pressure_advance
extra_decel_d = prev_pressure_d - npd