spoolman: change initialization to be equal to the rest of components
This commit is contained in:
parent
71b0ace83c
commit
6be0a2931f
@ -38,7 +38,6 @@ class Printer:
|
|||||||
self.fancount = 0
|
self.fancount = 0
|
||||||
self.output_pin_count = 0
|
self.output_pin_count = 0
|
||||||
self.tempstore = {}
|
self.tempstore = {}
|
||||||
self.spoolman = False
|
|
||||||
self.busy = False
|
self.busy = False
|
||||||
if not self.store_timeout:
|
if not self.store_timeout:
|
||||||
self.store_timeout = GLib.timeout_add_seconds(1, self._update_temp_store)
|
self.store_timeout = GLib.timeout_add_seconds(1, self._update_temp_store)
|
||||||
|
15
screen.py
15
screen.py
@ -867,6 +867,8 @@ class KlipperScreen(Gtk.Window):
|
|||||||
cameras = self.apiclient.send_request("server/webcams/list")
|
cameras = self.apiclient.send_request("server/webcams/list")
|
||||||
if cameras is not False:
|
if cameras is not False:
|
||||||
self.printer.configure_cameras(cameras['result']['webcams'])
|
self.printer.configure_cameras(cameras['result']['webcams'])
|
||||||
|
if "spoolman" in server_info["components"]:
|
||||||
|
self.printer.enable_spoolman()
|
||||||
|
|
||||||
if state['result']['klippy_connected'] is False:
|
if state['result']['klippy_connected'] is False:
|
||||||
logging.info("Klipper not connected")
|
logging.info("Klipper not connected")
|
||||||
@ -903,8 +905,6 @@ class KlipperScreen(Gtk.Window):
|
|||||||
self.files.initialize()
|
self.files.initialize()
|
||||||
self.files.refresh_files()
|
self.files.refresh_files()
|
||||||
|
|
||||||
self.init_spoolman()
|
|
||||||
|
|
||||||
logging.info("Printer initialized")
|
logging.info("Printer initialized")
|
||||||
self.initialized = True
|
self.initialized = True
|
||||||
self.reinit_count = 0
|
self.reinit_count = 0
|
||||||
@ -932,17 +932,6 @@ class KlipperScreen(Gtk.Window):
|
|||||||
logging.error("Couldn't get the temperature store size")
|
logging.error("Couldn't get the temperature store size")
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def init_spoolman(self):
|
|
||||||
server_config = self.apiclient.send_request("server/config")
|
|
||||||
if server_config:
|
|
||||||
try:
|
|
||||||
server_config["result"]["config"]["spoolman"]
|
|
||||||
self.printer.enable_spoolman()
|
|
||||||
except KeyError:
|
|
||||||
logging.warning("Not using Spoolman")
|
|
||||||
|
|
||||||
return False
|
|
||||||
|
|
||||||
def show_keyboard(self, entry=None, event=None):
|
def show_keyboard(self, entry=None, event=None):
|
||||||
if self.keyboard is not None:
|
if self.keyboard is not None:
|
||||||
return
|
return
|
||||||
|
Loading…
x
Reference in New Issue
Block a user