From 99cecc151ecca2f72baa4a5b0a87d204fa839f61 Mon Sep 17 00:00:00 2001 From: alfrix Date: Mon, 6 May 2024 11:26:01 -0300 Subject: [PATCH] printer: completely remove self.devices --- ks_includes/printer.py | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/ks_includes/printer.py b/ks_includes/printer.py index 35dc6587..2fc8ca93 100644 --- a/ks_includes/printer.py +++ b/ks_includes/printer.py @@ -12,7 +12,6 @@ class Printer: self.state = "disconnected" self.state_cb = state_cb self.state_callbacks = state_callbacks - self.devices = {} self.power_devices = {} self.tools = [] self.extrudercount = 0 @@ -31,7 +30,6 @@ class Printer: def reinit(self, printer_info, data): self.config = data['configfile']['config'] self.data = data - self.devices.clear() self.tools.clear() self.extrudercount = 0 self.tempdevcount = 0 @@ -49,19 +47,10 @@ class Printer: self.tools.append(x) self.tools = sorted(self.tools) self.extrudercount += 1 - if x.startswith('extruder_stepper'): - continue - self.devices[x] = { - "temperature": 0, - "target": 0 - } if x == 'heater_bed' \ or x.startswith('heater_generic ') \ or x.startswith('temperature_sensor ') \ or x.startswith('temperature_fan '): - self.devices[x] = {"temperature": 0} - if not x.startswith('temperature_sensor '): - self.devices[x]["target"] = 0 # Support for hiding devices by name name = x.split()[1] if len(x.split()) > 1 else x if not name.startswith("_"): @@ -213,7 +202,7 @@ class Printer: def get_heaters(self): heaters = self.get_config_section_list("heater_generic ") - if "heater_bed" in self.devices: + if "heater_bed" in self.config: heaters.insert(0, "heater_bed") return heaters @@ -327,10 +316,10 @@ class Printer: return list(self.tempstore) def device_has_target(self, device): - return "target" in self.devices[device] + return "target" in self.data[device] def device_has_power(self, device): - return "power" in self.devices[device] + return "power" in self.data[device] def get_temp_store(self, device, section=False, results=0): if device not in self.tempstore: