diff options
Diffstat (limited to 'klippy/extras/display_status.py')
| -rw-r--r-- | klippy/extras/display_status.py | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/klippy/extras/display_status.py b/klippy/extras/display_status.py index 5b2b6bec..769dcf7a 100644 --- a/klippy/extras/display_status.py +++ b/klippy/extras/display_status.py @@ -5,46 +5,55 @@ # # This file may be distributed under the terms of the GNU GPLv3 license. -M73_TIMEOUT = 5. +M73_TIMEOUT = 5.0 + class DisplayStatus: def __init__(self, config): self.printer = config.get_printer() - self.expire_progress = 0. + self.expire_progress = 0.0 self.progress = self.message = None # Register commands - gcode = self.printer.lookup_object('gcode') - gcode.register_command('M73', self.cmd_M73) - gcode.register_command('M117', self.cmd_M117) + gcode = self.printer.lookup_object("gcode") + gcode.register_command("M73", self.cmd_M73) + gcode.register_command("M117", self.cmd_M117) gcode.register_command( - 'SET_DISPLAY_TEXT', self.cmd_SET_DISPLAY_TEXT, - desc=self.cmd_SET_DISPLAY_TEXT_help) + "SET_DISPLAY_TEXT", + self.cmd_SET_DISPLAY_TEXT, + desc=self.cmd_SET_DISPLAY_TEXT_help, + ) + def get_status(self, eventtime): progress = self.progress if progress is not None and eventtime > self.expire_progress: - idle_timeout = self.printer.lookup_object('idle_timeout') + idle_timeout = self.printer.lookup_object("idle_timeout") idle_timeout_info = idle_timeout.get_status(eventtime) - if idle_timeout_info['state'] != "Printing": + if idle_timeout_info["state"] != "Printing": self.progress = progress = None if progress is None: - progress = 0. - sdcard = self.printer.lookup_object('virtual_sdcard', None) + progress = 0.0 + sdcard = self.printer.lookup_object("virtual_sdcard", None) if sdcard is not None: - progress = sdcard.get_status(eventtime)['progress'] - return { 'progress': progress, 'message': self.message } + progress = sdcard.get_status(eventtime)["progress"] + return {"progress": progress, "message": self.message} + def cmd_M73(self, gcmd): - progress = gcmd.get_float('P', None) + progress = gcmd.get_float("P", None) if progress is not None: - progress = progress / 100. - self.progress = min(1., max(0., progress)) + progress = progress / 100.0 + self.progress = min(1.0, max(0.0, progress)) curtime = self.printer.get_reactor().monotonic() self.expire_progress = curtime + M73_TIMEOUT + def cmd_M117(self, gcmd): msg = gcmd.get_raw_command_parameters() or None self.message = msg + cmd_SET_DISPLAY_TEXT_help = "Set or clear the display message" + def cmd_SET_DISPLAY_TEXT(self, gcmd): self.message = gcmd.get("MSG", None) + def load_config(config): return DisplayStatus(config) |