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

screen: bug fixes

Browse Source
This commit is contained in:
Jordan Ruthe 2021-01-20 22:02:48 -05:00
parent 90c84d5f17
commit 52cadb7744
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
screen.py
View File

@ -326,8 +326,10 @@ class KlipperScreen(Gtk.Window):
# Find current menu item # Find current menu item
panels = list(self._cur_panels) panels = list(self._cur_panels)
if "job_status" not in self._cur_panels: if "main_panel" in self._cur_panels:
menu = "__main" menu = "__main"
elif "splash_screen" in self._cur_panels:
menu = "__splashscreen"
else: else:
menu = "__print" menu = "__print"
@ -401,6 +403,8 @@ class KlipperScreen(Gtk.Window):
) )
def state_printing(self): def state_printing(self):
if "job_status" in self._cur_panels:
return
self.printer_printing() self.printer_printing()
def state_ready(self): def state_ready(self):
@ -510,11 +514,16 @@ class KlipperScreen(Gtk.Window):
'webhooks' 'webhooks'
] ]
printer_info = self.apiclient.get_printer_info() printer_info = self.apiclient.get_printer_info()
logger.debug("Sendingn request %s" % "printer/objects/query?" + "&".join(status_objects)) logger.debug("Sending request %s" % "printer/objects/query?" + "&".join(status_objects))
data = self.apiclient.send_request("printer/objects/query?" + "&".join(status_objects)) data = self.apiclient.send_request("printer/objects/query?" + "&".join(status_objects))
powerdevs = self.apiclient.send_request("machine/device_power/devices") powerdevs = self.apiclient.send_request("machine/device_power/devices")
data = data['result']['status'] data = data['result']['status']
if self.files == None:
self.files = KlippyFiles(self)
else:
self.files.add_timeout()
# Reinitialize printer, in case the printer was shut down and anything has changed. # Reinitialize printer, in case the printer was shut down and anything has changed.
self.printer.reinit(printer_info['result'], data) self.printer.reinit(printer_info['result'], data)
self.ws_subscribe() self.ws_subscribe()
@ -522,11 +531,6 @@ class KlipperScreen(Gtk.Window):
if powerdevs != False: if powerdevs != False:
self.printer.configure_power_devices(powerdevs['result']) self.printer.configure_power_devices(powerdevs['result'])
if self.files == None:
self.files = KlippyFiles(self)
else:
self.files.add_timeout()
def printer_ready(self): def printer_ready(self):
self.close_popup_message() self.close_popup_message()
self.show_panel('main_panel', "main_menu", "Main Menu", 2, items=self._config.get_menu_items("__main"), self.show_panel('main_panel', "main_menu", "Main Menu", 2, items=self._config.get_menu_items("__main"),