From f49e1ef6c45ac18b38793364c94f828e7add944b Mon Sep 17 00:00:00 2001 From: alfrix Date: Sun, 4 Dec 2022 22:33:43 -0300 Subject: [PATCH] main and temp simplify get temps --- panels/main_menu.py | 11 +---------- panels/temperature.py | 11 +---------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/panels/main_menu.py b/panels/main_menu.py index bfe839d4..7f223995 100644 --- a/panels/main_menu.py +++ b/panels/main_menu.py @@ -244,22 +244,13 @@ class MainPanel(MenuPanel): def process_update(self, action, data): if action != "notify_status_update": return - - for x in self._printer.get_tools(): + for x in (self._printer.get_tools() + self._printer.get_heaters()): self.update_temp( x, self._printer.get_dev_stat(x, "temperature"), self._printer.get_dev_stat(x, "target"), self._printer.get_dev_stat(x, "power"), ) - for h in self._printer.get_heaters(): - self.update_temp( - h, - self._printer.get_dev_stat(h, "temperature"), - self._printer.get_dev_stat(h, "target"), - self._printer.get_dev_stat(h, "power"), - ) - return def show_numpad(self, widget, device): diff --git a/panels/temperature.py b/panels/temperature.py index aa761669..a164cc08 100644 --- a/panels/temperature.py +++ b/panels/temperature.py @@ -503,22 +503,13 @@ class TemperaturePanel(ScreenPanel): def process_update(self, action, data): if action != "notify_status_update": return - - for x in self._printer.get_tools(): + for x in (self._printer.get_tools() + self._printer.get_heaters()): self.update_temp( x, self._printer.get_dev_stat(x, "temperature"), self._printer.get_dev_stat(x, "target"), self._printer.get_dev_stat(x, "power"), ) - for h in self._printer.get_heaters(): - self.update_temp( - h, - self._printer.get_dev_stat(h, "temperature"), - self._printer.get_dev_stat(h, "target"), - self._printer.get_dev_stat(h, "power"), - ) - return def show_numpad(self, widget, device=None): for d in self.active_heaters: