From 7b9c98a0a820ffcc8a93ee95c8a0e37251613c3a Mon Sep 17 00:00:00 2001 From: Jordan Date: Sat, 8 May 2021 14:31:50 -0400 Subject: [PATCH] Include temperature_sensor in listing of temperatures This update will add temperature sensors to the main menu and temperature panels. --- ks_includes/printer.py | 6 +++++- panels/preheat.py | 2 ++ panels/temperature.py | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ks_includes/printer.py b/ks_includes/printer.py index e978794e..5641882b 100644 --- a/ks_includes/printer.py +++ b/ks_includes/printer.py @@ -54,11 +54,13 @@ class Printer: if "shared_heater" in self.config[x]: continue self.extrudercount += 1 - if x.startswith('heater_bed') or x.startswith('heater_generic '): + if x == 'heater_bed' or x.startswith('heater_generic ') or x.startswith('temperature_sensor '): + logging.info("X: %s" % x) self.devices[x] = { "temperature": 0, "target": 0 } + logging.info("self.devices: %s" % self.devices) if x.startswith('bed_mesh '): r = self.config[x] r['x_count'] = int(r['x_count']) @@ -181,6 +183,8 @@ class Printer: heaters.append("heater_bed") for h in self.get_config_section_list("heater_generic "): heaters.append(h) + for h in self.get_config_section_list("temperature_sensor "): + heaters.append(h) return heaters def get_printer_status_data(self): diff --git a/panels/preheat.py b/panels/preheat.py index 0d40a774..9324c63c 100644 --- a/panels/preheat.py +++ b/panels/preheat.py @@ -34,6 +34,8 @@ class PreheatPanel(ScreenPanel): add_heaters = self._printer.get_heaters() for h in add_heaters: + if h.startswith("temperature_sensor "): + continue if h == "heater_bed": self.labels[h] = self._gtk.ButtonImage("bed", self._gtk.formatTemperatureString(0, 0)) else: diff --git a/panels/temperature.py b/panels/temperature.py index 1198a87e..217f89c5 100644 --- a/panels/temperature.py +++ b/panels/temperature.py @@ -49,7 +49,8 @@ class TemperaturePanel(ScreenPanel): i = 0 cols = 3 if len(self.heaters) > 4 else (1 if len(self.heaters) <= 2 else 2) for h in self.heaters: - self.labels[h].connect('clicked', self.select_heater, h) + if not (h.startswith("temperature_sensor")): + self.labels[h].connect('clicked', self.select_heater, h) eq_grid.attach(self.labels[h], i%cols, int(i/cols), 1, 1) i += 1