diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2018-01-19 22:22:17 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2018-01-28 12:19:26 -0500 |
| commit | 81013ba5c8638dd42932bd893e1b3115b1b98041 (patch) | |
| tree | 3e0d60c2d084f808f2788a4645579093abdc8739 /klippy/extruder.py | |
| parent | f0a754e496ca989bc355555e2c798c362299abc3 (diff) | |
| download | kutter-81013ba5c8638dd42932bd893e1b3115b1b98041.tar.gz kutter-81013ba5c8638dd42932bd893e1b3115b1b98041.tar.xz kutter-81013ba5c8638dd42932bd893e1b3115b1b98041.zip | |
klippy: Add access methods and avoid peeking into the printer classes
Add get_reactor(), lookup_object(), lookup_module_objects(), and
set_rollover_info() to the main Printer class so that callers do not
need to peek into the class' members. Similarly, add get_printer()
and get_name() methods to the ConfigWrapper class.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extruder.py')
| -rw-r--r-- | klippy/extruder.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/klippy/extruder.py b/klippy/extruder.py index 82c89c47..2e890025 100644 --- a/klippy/extruder.py +++ b/klippy/extruder.py @@ -1,6 +1,6 @@ # Code for handling printer nozzle extruders # -# Copyright (C) 2016 Kevin O'Connor <kevin@koconnor.net> +# Copyright (C) 2016-2018 Kevin O'Connor <kevin@koconnor.net> # # This file may be distributed under the terms of the GNU GPLv3 license. import math, logging @@ -24,7 +24,7 @@ class PrinterExtruder: 'max_extrude_cross_section', 4. * self.nozzle_diameter**2 , above=0.) self.max_extrude_ratio = max_cross_section / self.filament_area - toolhead = printer.objects['toolhead'] + toolhead = 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 @@ -248,17 +248,17 @@ def add_printer_objects(printer, config): def get_printer_extruders(printer): out = [] for i in range(99): - extruder = printer.objects.get('extruder%d' % (i,)) + extruder = printer.lookup_object('extruder%d' % (i,), None) if extruder is None: break out.append(extruder) return out def get_printer_heater(printer, name): - if name == 'heater_bed' and name in printer.objects: - return printer.objects[name] + if name == 'heater_bed': + return printer.lookup_object(name) if name == 'extruder': name = 'extruder0' - if name.startswith('extruder') and name in printer.objects: - return printer.objects[name].get_heater() + if name.startswith('extruder'): + return printer.lookup_object(name).get_heater() raise printer.config_error("Unknown heater '%s'" % (name,)) |