diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2019-01-08 12:00:45 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2019-01-08 12:03:46 -0500 |
| commit | bf647749dd3eeaa6da57b64ed122c2be42ed58e7 (patch) | |
| tree | c1f567755335ec65e3609a6480fc9be92e52c6c9 /klippy/extras/display/menu.py | |
| parent | 33f5b5f2858b344a118c6a219487cccec759e024 (diff) | |
| download | kutter-bf647749dd3eeaa6da57b64ed122c2be42ed58e7.tar.gz kutter-bf647749dd3eeaa6da57b64ed122c2be42ed58e7.tar.xz kutter-bf647749dd3eeaa6da57b64ed122c2be42ed58e7.zip | |
menu: Don't peek into printer.objects member variable
Use the printer.lookup_objects() method to get the list of available
printer objects.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras/display/menu.py')
| -rw-r--r-- | klippy/extras/display/menu.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/klippy/extras/display/menu.py b/klippy/extras/display/menu.py index 470a2078..e6304e39 100644 --- a/klippy/extras/display/menu.py +++ b/klippy/extras/display/menu.py @@ -1049,13 +1049,11 @@ class MenuManager: def handle_ready(self): # Load all available printer objects - for cfg_name in self.printer.objects: - obj = self.printer.lookup_object(cfg_name, None) - if obj is not None: - name = ".".join(str(cfg_name).split()) - self.objs[name] = obj - logging.debug("Load module '%s' -> %s" % ( - str(name), str(obj.__class__))) + for cfg_name, obj in self.printer.lookup_objects(): + name = ".".join(str(cfg_name).split()) + self.objs[name] = obj + logging.debug("Load module '%s' -> %s" % ( + str(name), str(obj.__class__))) # start timer reactor = self.printer.get_reactor() reactor.register_timer(self.timer_event, reactor.NOW) |