diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2017-09-03 15:17:02 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2017-09-03 15:45:04 -0400 |
| commit | 7a81bfc4a4651c913add10e34e7431513cf8a5f5 (patch) | |
| tree | 7f3a40804dd52154d864cc71e7a120cddecf4725 /klippy/extruder.py | |
| parent | 0d13834293d0b5db2fc3407bd603dbfaa691402d (diff) | |
| download | kutter-7a81bfc4a4651c913add10e34e7431513cf8a5f5.tar.gz kutter-7a81bfc4a4651c913add10e34e7431513cf8a5f5.tar.xz kutter-7a81bfc4a4651c913add10e34e7431513cf8a5f5.zip | |
toolhead: Eliminate set_max_jerk() from kinematic classes
Allow the kinematic classes to query the max velocity, max accel, and
max halt velocity from the toolhead class instead of having the
toolhead class call into the kinematic classes with those values.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extruder.py')
| -rw-r--r-- | klippy/extruder.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/klippy/extruder.py b/klippy/extruder.py index 012f6290..4ad3a38c 100644 --- a/klippy/extruder.py +++ b/klippy/extruder.py @@ -21,6 +21,15 @@ class PrinterExtruder: 'max_extrude_cross_section', 4. * self.nozzle_diameter**2 , above=0.) self.max_extrude_ratio = max_cross_section / filament_area + toolhead = printer.objects['toolhead'] + max_velocity, max_accel = toolhead.get_max_velocity() + self.max_e_velocity = self.config.getfloat( + 'max_extrude_only_velocity', max_velocity * self.max_extrude_ratio + , above=0.) + self.max_e_accel = self.config.getfloat( + 'max_extrude_only_accel', max_accel * self.max_extrude_ratio + , above=0.) + self.stepper.set_max_jerk(9999999.9, 9999999.9) self.max_e_dist = config.getfloat( 'max_extrude_only_distance', 50., minval=0.) self.max_e_velocity = self.max_e_accel = None @@ -34,14 +43,6 @@ class PrinterExtruder: 'pressure_advance_lookahead_time', 0.010, minval=0.) self.need_motor_enable = True self.extrude_pos = 0. - def set_max_jerk(self, max_xy_halt_velocity, max_velocity, max_accel): - self.max_e_velocity = self.config.getfloat( - 'max_extrude_only_velocity', max_velocity * self.max_extrude_ratio - , above=0.) - self.max_e_accel = self.config.getfloat( - 'max_extrude_only_accel', max_accel * self.max_extrude_ratio - , above=0.) - self.stepper.set_max_jerk(9999999.9, 9999999.9) def get_heater(self): return self.heater def set_active(self, print_time, is_active): |