CreatBot/GeneralKlipperScreen
7
0
Fork 0
forked from CreatBot/CreatBotKlipperScreen
Code Pull Requests Activity

splash: do not show power_on if moonraker is not connected

Browse Source
This commit is contained in:
alfrix 2022-03-31 13:47:42 -03:00
parent 51b4d1e1e6
commit 76b7ad54eb
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panels/splash_screen.py
View File

@ -82,7 +82,7 @@ class SplashScreenPanel(ScreenPanel):
self.clear_action_bar() self.clear_action_bar()
printer = self._screen.connected_printer printer = self._screen.connected_printer
if printer is not None: if printer is not None and not self._screen.shutdown:
printer_cfg = self._config.get_printer_config(printer) printer_cfg = self._config.get_printer_config(printer)
if printer_cfg is not None: if printer_cfg is not None:
power_devices = printer_cfg.get("power_devices", "") power_devices = printer_cfg.get("power_devices", "")

7
screen.py
View File

@ -80,6 +80,7 @@ class KlipperScreen(Gtk.Window):
init_printer_timeout = None init_printer_timeout = None
dpms_timeout = None dpms_timeout = None
screensaver_timeout = None screensaver_timeout = None
reinit_count = 0
def __init__(self, args, version): def __init__(self, args, version):
self.version = version self.version = version
@ -922,8 +923,10 @@ class KlipperScreen(Gtk.Window):
return False return False
else: else:
# Moonraker is ready, set a loop to init the printer # Moonraker is ready, set a loop to init the printer
self.reinit_count += 1
self.init_printer_timeout = GLib.timeout_add_seconds(3, self.init_printer) self.init_printer_timeout = GLib.timeout_add_seconds(3, self.init_printer)
self.shutdown = False
powerdevs = self.apiclient.send_request("machine/device_power/devices") powerdevs = self.apiclient.send_request("machine/device_power/devices")
if powerdevs is not False: if powerdevs is not False:
self.printer.configure_power_devices(powerdevs['result']) self.printer.configure_power_devices(powerdevs['result'])
@ -931,7 +934,8 @@ class KlipperScreen(Gtk.Window):
if state['result']['klippy_connected'] is False: if state['result']['klippy_connected'] is False:
self.panels['splash_screen'].update_text( self.panels['splash_screen'].update_text(
_("Moonraker: connected") + _("Moonraker: connected") +
("\n\nKlipper: %s\n\n") % state['result']['klippy_state']) ("\n\nKlipper: %s\n\n") % state['result']['klippy_state'] +
_("Retry #%s") % self.reinit_count)
return False return False
printer_info = self.apiclient.get_printer_info() printer_info = self.apiclient.get_printer_info()
@ -985,6 +989,7 @@ class KlipperScreen(Gtk.Window):
logging.info("Printer initialized") logging.info("Printer initialized")
GLib.source_remove(self.init_printer_timeout) GLib.source_remove(self.init_printer_timeout)
self.reinit_count = 0
return False return False
def printer_ready(self): def printer_ready(self):