3D-printing/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2025-08-08 14:34:06 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

toolhead: Calculate and store axes_r in move class

Browse source 
Calculate the ratio of axis distance to total move distance (axis_d /
move_d) and store in a new member variable axes_r.  This avoids
needing to recalculate the value in other code.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-11-06 08:41:50 -05:00
parent 257058981e
commit 86121ff79e
7 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
klippy/kinematics/extruder.py
View file

@ -90,7 +90,7 @@ class PrinterExtruder:
def motor_off(self, print_time):
self.stepper.motor_enable(print_time, 0)
def check_move(self, move):
move.extrude_r = move.axes_d[3] / move.move_d
move.extrude_r = move.axes_r[3]
move.extrude_max_corner_v = 0.
if not self.heater.can_extrude:
raise homing.EndstopError(
@ -111,7 +111,7 @@ class PrinterExtruder:
# Permit extrusion if amount extruded is tiny
move.extrude_r = self.max_extrude_ratio
return
area = move.axes_d[3] * self.filament_area / move.move_d
area = move.axes_r[3] * self.filament_area
logging.debug("Overextrude: %s vs %s (area=%.3f dist=%.3f)",
move.extrude_r, self.max_extrude_ratio,
area, move.move_d)
@ -172,7 +172,7 @@ class PrinterExtruder:
return flush_count
def move(self, print_time, move):
axis_d = move.axes_d[3]
axis_r = axis_d / move.move_d
axis_r = move.axes_r[3]
accel = move.accel * axis_r
start_v = move.start_v * axis_r
cruise_v = move.cruise_v * axis_r