diff options
author | Kevin O'Connor <kevin@koconnor.net> | 2018-02-05 13:52:05 -0500 |
---|---|---|
committer | Kevin O'Connor <kevin@koconnor.net> | 2018-02-05 13:52:05 -0500 |
commit | 0a5b07f9dafb19fca4305aa141dbae9e7571977b (patch) | |
tree | c04804beb5c21220ec31328a395ad4ba6f2eab62 /klippy/toolhead.py | |
parent | 08874b9c91544c012763766c51b6a0c279972140 (diff) | |
download | kutter-0a5b07f9dafb19fca4305aa141dbae9e7571977b.tar.gz kutter-0a5b07f9dafb19fca4305aa141dbae9e7571977b.tar.xz kutter-0a5b07f9dafb19fca4305aa141dbae9e7571977b.zip |
klippy: Allow any stats producer to determine when stats are needed
Instead of using the toolhead class to determine if stats should be
reported, allow every printer object with a stats() callback to
determine if stats are needed.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/toolhead.py')
-rw-r--r-- | klippy/toolhead.py | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/klippy/toolhead.py b/klippy/toolhead.py index cd760616..1b5021c0 100644 --- a/klippy/toolhead.py +++ b/klippy/toolhead.py @@ -358,17 +358,13 @@ class ToolHead: self.move_queue.set_extruder(extruder) self.commanded_pos[3] = extrude_pos # Misc commands - def check_active(self, eventtime): + def stats(self, eventtime): for m in self.all_mcus: m.check_active(self.print_time, eventtime) - if not self.sync_print_time: - return True - return self.print_time + 60. > self.mcu.estimated_print_time(eventtime) - def stats(self, eventtime): - est_print_time = self.mcu.estimated_print_time(eventtime) - buffer_time = max(0., self.print_time - est_print_time) - return "print_time=%.3f buffer_time=%.3f print_stall=%d" % ( - self.print_time, buffer_time, self.print_stall) + buffer_time = self.print_time - self.mcu.estimated_print_time(eventtime) + is_active = buffer_time > -60. or not self.sync_print_time + return is_active, "print_time=%.3f buffer_time=%.3f print_stall=%d" % ( + self.print_time, max(buffer_time, 0.), self.print_stall) def printer_state(self, state): if state == 'shutdown': try: |