diff options
| -rw-r--r-- | docs/Config_Changes.md | 2 | ||||
| -rw-r--r-- | klippy/extras/display_status.py | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/docs/Config_Changes.md b/docs/Config_Changes.md index 5cbe1eae..b78a23be 100644 --- a/docs/Config_Changes.md +++ b/docs/Config_Changes.md @@ -8,6 +8,8 @@ All dates in this document are approximate. ## Changes +20220307: `M73` will no longer set print progress to 0 if `P` is missing. + 20220304: There is no longer a default for the `extruder` parameter of [extruder_stepper](Config_Reference.md#extruder_stepper) config sections. If desired, specify `extruder: extruder` explicitly to diff --git a/klippy/extras/display_status.py b/klippy/extras/display_status.py index 16a8878d..be7a58b8 100644 --- a/klippy/extras/display_status.py +++ b/klippy/extras/display_status.py @@ -30,10 +30,12 @@ class DisplayStatus: progress = sdcard.get_status(eventtime)['progress'] return { 'progress': progress, 'message': self.message } def cmd_M73(self, gcmd): - progress = gcmd.get_float('P', 0.) / 100. - self.progress = min(1., max(0., progress)) - curtime = self.printer.get_reactor().monotonic() - self.expire_progress = curtime + M73_TIMEOUT + progress = gcmd.get_float('P', None) + if progress is not None: + progress = progress / 100. + self.progress = min(1., max(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 |