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

refactor: combine printer query items

Browse Source
This commit is contained in:
alfrix 2024-04-30 06:32:43 -03:00
parent e1e3118789
commit 81560ca006
1 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
screen.py
View File

@ -32,26 +32,6 @@ from panels.base_panel import BasePanel
logging.getLogger("urllib3").setLevel(logging.WARNING) logging.getLogger("urllib3").setLevel(logging.WARNING)
PRINTER_BASE_STATUS_OBJECTS = [
'bed_mesh',
'configfile',
'display_status',
'extruder',
'fan',
'gcode_move',
'heater_bed',
'idle_timeout',
'pause_resume',
'print_stats',
'toolhead',
'virtual_sdcard',
'webhooks',
'motion_report',
'firmware_retraction',
'exclude_object',
'manual_probe',
]
klipperscreendir = pathlib.Path(__file__).parent.resolve() klipperscreendir = pathlib.Path(__file__).parent.resolve()
@ -980,20 +960,37 @@ class KlipperScreen(Gtk.Window):
self.printer.available_commands = self.apiclient.get_gcode_help()['result'] self.printer.available_commands = self.apiclient.get_gcode_help()['result']
self.ws_subscribe() self.ws_subscribe()
extra_items = (self.printer.get_tools() items = (
+ self.printer.get_heaters() 'bed_mesh',
+ self.printer.get_temp_sensors() 'configfile',
+ self.printer.get_fans() 'display_status',
+ self.printer.get_temp_fans() 'extruder',
+ self.printer.get_filament_sensors() 'fan',
+ self.printer.get_output_pins() 'gcode_move',
+ self.printer.get_leds() 'heater_bed',
'idle_timeout',
'pause_resume',
'print_stats',
'toolhead',
'virtual_sdcard',
'webhooks',
'motion_report',
'firmware_retraction',
'exclude_object',
'manual_probe',
*self.printer.get_tools(),
*self.printer.get_heaters(),
*self.printer.get_temp_sensors(),
*self.printer.get_fans(),
*self.printer.get_temp_fans(),
*self.printer.get_filament_sensors(),
*self.printer.get_output_pins(),
*self.printer.get_leds(),
) )
data = self.apiclient.send_request("printer/objects/query?" + "&".join(PRINTER_BASE_STATUS_OBJECTS + data = self.apiclient.send_request("printer/objects/query?" + "&".join(items))
extra_items))
if data is False: if data is False:
return self._init_printer("Error getting printer object data with extra items") return self._init_printer("Error getting printer object data")
self.files.set_gcodes_path() self.files.set_gcodes_path()