diff options
author | Kevin O'Connor <kevin@koconnor.net> | 2017-01-14 13:35:27 -0500 |
---|---|---|
committer | Kevin O'Connor <kevin@koconnor.net> | 2017-01-16 15:32:35 -0500 |
commit | fc6a31eac8bcb3789187b2b4df49776fb8a2a86d (patch) | |
tree | 0e091065e4946af54e2b8ab36b291aecc330be50 /klippy/extruder.py | |
parent | 064e8bdd8476d207bffab7a7ee4a97f890dbc107 (diff) | |
download | kutter-fc6a31eac8bcb3789187b2b4df49776fb8a2a86d.tar.gz kutter-fc6a31eac8bcb3789187b2b4df49776fb8a2a86d.tar.xz kutter-fc6a31eac8bcb3789187b2b4df49776fb8a2a86d.zip |
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>
Diffstat (limited to 'klippy/extruder.py')
-rw-r--r-- | klippy/extruder.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/klippy/extruder.py b/klippy/extruder.py index 7e314a7b..711733dd 100644 --- a/klippy/extruder.py +++ b/klippy/extruder.py @@ -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 |