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/gcode.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/gcode.py')
| -rw-r--r-- | klippy/gcode.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/klippy/gcode.py b/klippy/gcode.py index 0afd3ff1..261bbf22 100644 --- a/klippy/gcode.py +++ b/klippy/gcode.py @@ -1,6 +1,6 @@ # Parse gcode commands # -# Copyright (C) 2016,2017 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 os, re, logging, collections @@ -17,7 +17,7 @@ class GCodeParser: self.printer = printer self.fd = fd # Input handling - self.reactor = printer.reactor + self.reactor = printer.get_reactor() self.is_processing_data = False self.is_fileinput = not not printer.get_start_args().get("debuginput") self.fd_handle = None @@ -72,14 +72,14 @@ class GCodeParser: self.is_printer_ready = True self.gcode_handlers = self.ready_gcode_handlers # Lookup printer components - self.toolhead = self.printer.objects.get('toolhead') + self.toolhead = self.printer.lookup_object('toolhead') extruders = extruder.get_printer_extruders(self.printer) if extruders: self.extruder = extruders[0] self.toolhead.set_extruder(self.extruder) self.heaters = [ e.get_heater() for e in extruders ] - self.heaters.append(self.printer.objects.get('heater_bed')) - self.fan = self.printer.objects.get('fan') + self.heaters.append(self.printer.lookup_object('heater_bed', None)) + self.fan = self.printer.lookup_object('fan', None) if self.is_fileinput and self.fd_handle is None: self.fd_handle = self.reactor.register_fd(self.fd, self.process_data) def reset_last_position(self): |