CreatBot/CreatBotKlipperScreen
7
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes to make ks start and give the no support error in python 3.7

Browse Source
This commit is contained in:
Alfredo Monclus 2024-05-29 22:26:38 -03:00
parent 3fd370eafc
commit 5619a77d6e
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ks_includes/config.py
View File

@ -456,7 +456,8 @@ class KlipperScreenConfig:
directories = [printer_data_config, xdg_config, klipperscreendir] directories = [printer_data_config, xdg_config, klipperscreendir]
for directory in directories: for directory in directories:
if path := self.check_path_exists(directory, self.configfile_name): path = self.check_path_exists(directory, self.configfile_name)
if path:
return path return path
# fallback # fallback

6
ks_includes/functions.py
View File

@ -40,7 +40,8 @@ try:
onoff_p = ctypes.create_string_buffer(1) onoff_p = ctypes.create_string_buffer(1)
state_p = ctypes.create_string_buffer(2) state_p = ctypes.create_string_buffer(2)
if libXext.DPMSInfo(display, state_p, onoff_p): if libXext.DPMSInfo(display, state_p, onoff_p):
if onoff := struct.unpack('B', onoff_p.raw)[0]: onoff = struct.unpack('B', onoff_p.raw)[0]
if onoff:
state = struct.unpack('H', state_p.raw)[0] state = struct.unpack('H', state_p.raw)[0]
libXext.XCloseDisplay(display) libXext.XCloseDisplay(display)
return state return state
@ -72,7 +73,8 @@ def get_wireless_interfaces():
return None return None
interfaces = [] interfaces = []
for line in result: for line in result:
if match := re.search('^(\\S+)\\s+.*$', line): match = re.search('^(\\S+)\\s+.*$', line)
if match:
interfaces.append(match[1]) interfaces.append(match[1])
return interfaces return interfaces

9
screen.py
View File

@ -885,7 +885,8 @@ class KlipperScreen(Gtk.Window):
if self.connected_printer is None or not devices: if self.connected_printer is None or not devices:
return found_devices return found_devices
devices = [str(i.strip()) for i in devices.split(',')] devices = [str(i.strip()) for i in devices.split(',')]
if power_devices := self.printer.get_power_devices(): power_devices = self.printer.get_power_devices()
if power_devices:
found_devices = [dev for dev in devices if dev in power_devices] found_devices = [dev for dev in devices if dev in power_devices]
logging.info(f"Found {found_devices}", ) logging.info(f"Found {found_devices}", )
return found_devices return found_devices
@ -1040,7 +1041,8 @@ class KlipperScreen(Gtk.Window):
def init_tempstore(self): def init_tempstore(self):
if len(self.printer.get_temp_devices()) == 0: if len(self.printer.get_temp_devices()) == 0:
return return
if tempstore := self.apiclient.send_request("server/temperature_store"): tempstore = self.apiclient.send_request("server/temperature_store")
if tempstore:
self.printer.init_temp_store(tempstore) self.printer.init_temp_store(tempstore)
if hasattr(self.panels[self._cur_panels[-1]], "update_graph_visibility"): if hasattr(self.panels[self._cur_panels[-1]], "update_graph_visibility"):
self.panels[self._cur_panels[-1]].update_graph_visibility() self.panels[self._cur_panels[-1]].update_graph_visibility()
@ -1051,7 +1053,8 @@ class KlipperScreen(Gtk.Window):
if set(self.printer.tempstore) != set(self.printer.get_temp_devices()): if set(self.printer.tempstore) != set(self.printer.get_temp_devices()):
GLib.timeout_add_seconds(5, self.init_tempstore) GLib.timeout_add_seconds(5, self.init_tempstore)
return return
if server_config := self.apiclient.send_request("server/config"): server_config = self.apiclient.send_request("server/config")
if server_config:
try: try:
self.printer.tempstore_size = server_config["config"]["data_store"]["temperature_store_size"] self.printer.tempstore_size = server_config["config"]["data_store"]["temperature_store_size"]
logging.info(f"Temperature store size: {self.printer.tempstore_size}") logging.info(f"Temperature store size: {self.printer.tempstore_size}")