diff options
author | Kevin O'Connor <kevin@koconnor.net> | 2018-06-21 13:47:39 -0400 |
---|---|---|
committer | Kevin O'Connor <kevin@koconnor.net> | 2018-06-22 14:09:01 -0400 |
commit | d0590ccb0e63390418229936930c94c8e19fcfe1 (patch) | |
tree | 114c84c16c3c86ba8eca5778f61f415a26391da0 /klippy/extruder.py | |
parent | 76e2b041b4910f2e83782f9ec327e5cfc3aa18b2 (diff) | |
download | kutter-d0590ccb0e63390418229936930c94c8e19fcfe1.tar.gz kutter-d0590ccb0e63390418229936930c94c8e19fcfe1.tar.xz kutter-d0590ccb0e63390418229936930c94c8e19fcfe1.zip |
stepper: No need to pass printer reference to kinematic/stepper constructors
The config reference already stores a reference to the printer object.
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, 8 insertions, 9 deletions
diff --git a/klippy/extruder.py b/klippy/extruder.py index c6c351e7..609cabe6 100644 --- a/klippy/extruder.py +++ b/klippy/extruder.py @@ -9,16 +9,16 @@ import stepper, homing, chelper EXTRUDE_DIFF_IGNORE = 1.02 class PrinterExtruder: - def __init__(self, printer, config): - self.printer = printer + def __init__(self, config): + self.printer = config.get_printer() self.name = config.get_name() shared_heater = config.get('shared_heater', None) - pheater = printer.lookup_object('heater') + pheater = self.printer.lookup_object('heater') if shared_heater is None: self.heater = pheater.setup_heater(config) else: self.heater = pheater.lookup_heater(shared_heater) - self.stepper = stepper.PrinterStepper(printer, config) + self.stepper = stepper.PrinterStepper(config) self.nozzle_diameter = config.getfloat('nozzle_diameter', above=0.) filament_diameter = config.getfloat( 'filament_diameter', minval=self.nozzle_diameter) @@ -28,7 +28,7 @@ class PrinterExtruder: , above=0.) self.max_extrude_ratio = max_cross_section / self.filament_area logging.info("Extruder max_extrude_ratio=%.6f", self.max_extrude_ratio) - toolhead = printer.lookup_object('toolhead') + toolhead = self.printer.lookup_object('toolhead') max_velocity, max_accel = toolhead.get_max_velocity() self.max_e_velocity = config.getfloat( 'max_extrude_only_velocity', max_velocity * self.max_extrude_ratio @@ -236,12 +236,11 @@ def add_printer_objects(printer, config): section = 'extruder%d' % (i,) if not config.has_section(section): if not i and config.has_section('extruder'): - printer.add_object('extruder0', PrinterExtruder( - printer, config.getsection('extruder'))) + pe = PrinterExtruder(config.getsection('extruder')) + printer.add_object('extruder0', pe) continue break - printer.add_object(section, PrinterExtruder( - printer, config.getsection(section))) + printer.add_object(section, PrinterExtruder(config.getsection(section))) def get_printer_extruders(printer): out = [] |