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

printer_initializing: refactor message generation and remove markup

Browse Source 
markup caused issues with status messages
This commit is contained in:
alfrix 2022-11-21 09:18:36 -03:00
parent 818f1ab465
commit 7b7c3838fc
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ks_includes/KlippyWebsocket.py
View File

@ -62,8 +62,7 @@ class KlippyWebsocket(threading.Thread):
if state is False: if state is False:
if self.reconnect_count > 2: if self.reconnect_count > 2:
self._screen.printer_initializing( self._screen.printer_initializing(
_("Cannot connect to Moonraker") _("Cannot connect to Moonraker") + '\n\n'
+ f'\n\n{self._url}\n\n'
+ _("Retrying") + f' #{self.reconnect_count}' + _("Retrying") + f' #{self.reconnect_count}'
) )
return False return False
@ -159,7 +158,7 @@ class KlippyWebsocket(threading.Thread):
self.connecting = False self.connecting = False
self._screen.printer_initializing( self._screen.printer_initializing(
_("Cannot connect to Moonraker") _("Cannot connect to Moonraker")
+ f'\n\n{self._url}\n\n{self._screen.apiclient.status}') + f'\n\n{self._screen.apiclient.status}')
return False return False
logging.debug("Attempting to reconnect") logging.debug("Attempting to reconnect")
self.connect() self.connect()

22
screen.py
View File

@ -659,18 +659,13 @@ class KlipperScreen(Gtk.Window):
def state_error(self): def state_error(self):
self.close_screensaver() self.close_screensaver()
msg = self.printer.get_stat("webhooks", "state_message") msg = _("Klipper has encountered an error.") + "\n"
if "FIRMWARE_RESTART" in msg: state = self.printer.get_stat("webhooks", "state_message")
self.printer_initializing("<b>" + _("Klipper has encountered an error.") + "\n" + if "FIRMWARE_RESTART" in state:
_("A FIRMWARE_RESTART may fix the issue.") + msg += _("A FIRMWARE_RESTART may fix the issue.") + "\n"
"</b>" + "\n\n" + msg) elif "micro-controller" in state:
elif "micro-controller" in msg: msg += _("Please recompile and flash the micro-controller.") + "\n"
self.printer_initializing("<b>" + _("Klipper has encountered an error.") + self.printer_initializing(msg + "\n" + state)
_("Please recompile and flash the micro-controller.") +
"</b>" + "\n\n" + msg)
else:
self.printer_initializing("<b>" + _("Klipper has encountered an error.") +
"</b>" + "\n\n" + msg)
def state_paused(self): def state_paused(self):
if "job_status" not in self._cur_panels: if "job_status" not in self._cur_panels:
@ -695,8 +690,7 @@ class KlipperScreen(Gtk.Window):
self.close_screensaver() self.close_screensaver()
msg = self.printer.get_stat("webhooks", "state_message") msg = self.printer.get_stat("webhooks", "state_message")
msg = msg if "ready" not in msg else "" msg = msg if "ready" not in msg else ""
self.printer_initializing("<b>" + _("Klipper has shutdown") + self.printer_initializing(_("Klipper has shutdown") + "\n\n" + msg)
"</b>" + "\n\n" + msg)
def toggle_macro_shortcut(self, value): def toggle_macro_shortcut(self, value):
self.base_panel.show_macro_shortcut(value) self.base_panel.show_macro_shortcut(value)