diff options
author | Kamil TrzciĆski <ayufan@ayufan.eu> | 2021-06-14 21:09:55 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-14 15:09:55 -0400 |
commit | 46f51b2bb0dadfff0382af32c22356571bb46d17 (patch) | |
tree | ffc30c601b7bc5c21658fb1defb96d4c6ee34a63 /klippy/extras/print_stats.py | |
parent | f7279a037d7760befb2f085ab0ab99057681862e (diff) | |
download | kutter-46f51b2bb0dadfff0382af32c22356571bb46d17.tar.gz kutter-46f51b2bb0dadfff0382af32c22356571bb46d17.tar.xz kutter-46f51b2bb0dadfff0382af32c22356571bb46d17.zip |
print_stats: add `cancelled` when `CANCEL_PRINT` used (#4366)
Before this change, a `CANCEL_PRINT` set a `print_stats` to `paused`
that would later be workaround-ed with `fluidd`/`mainsail` to re-define
`CANCEL_PRINT`.
This sets a proper canceled state, but additionally closes a file
from a `virtual_sdcard` context for `canceled`/`error`, as this is no longer
resumable from this point.
Signed-off-by: Kamil Trzcinski <ayufan@ayufan.eu>
Diffstat (limited to 'klippy/extras/print_stats.py')
-rw-r--r-- | klippy/extras/print_stats.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/klippy/extras/print_stats.py b/klippy/extras/print_stats.py index 7fc816d9..ab300f27 100644 --- a/klippy/extras/print_stats.py +++ b/klippy/extras/print_stats.py @@ -41,11 +41,15 @@ class PrintStats: self._update_filament_usage(curtime) if self.state != "error": self.state = "paused" - def note_error(self, message): - self.state = "error" - self.error_message = message def note_complete(self): - self.state = "complete" + self._note_finish("complete") + def note_error(self, message): + self._note_finish("error", message) + def note_cancel(self): + self._note_finish("cancelled") + def _note_finish(self, state, error_message = ""): + self.state = state + self.error_message = error_message eventtime = self.reactor.monotonic() self.total_duration = eventtime - self.print_start_time if self.filament_used < 0.0000001: |