Mirror
/
klipper-dgus
mirror of https://github.com/Desuuuu/klipper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dgus_status: Fix naive remaining time going up

This commit is contained in:
Desuuuu 2022-01-22 16:59:13 +01:00
parent 2cdd446b09
commit 2e5636beb1
No known key found for this signature in database
GPG Key ID: 85943F4B2C2CE0DC
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
klippy/extras/dgus_status.py
View File

@ -18,6 +18,7 @@ class DGUSStatus:
self.progress = None self.progress = None
self.filename = None self.filename = None
self.finish_at = None self.finish_at = None
self.finish_at_naive = None
self.pause_at = None self.pause_at = None
self.idle_timeout = None self.idle_timeout = None
@ -61,6 +62,7 @@ class DGUSStatus:
self.progress = None self.progress = None
self.filename = None self.filename = None
self.finish_at = None self.finish_at = None
self.finish_at_naive = None
self.pause_at = None self.pause_at = None
def check_pause(self, eventtime): def check_pause(self, eventtime):
@ -73,6 +75,8 @@ class DGUSStatus:
self.start_at += pause_duration self.start_at += pause_duration
if self.finish_at is not None: if self.finish_at is not None:
self.finish_at += pause_duration self.finish_at += pause_duration
if self.finish_at_naive is not None:
self.finish_at_naive[1] += pause_duration
self.pause_at = None self.pause_at = None
return eventtime + 5. return eventtime + 5.
@ -179,11 +183,16 @@ class DGUSStatus:
remaining_time = self.finish_at - eventtime remaining_time = self.finish_at - eventtime
else: else:
progress = self.get_progress(eventtime) progress = self.get_progress(eventtime)
printing_time = self.get_printing_time(eventtime) if (self.finish_at_naive is None
if (progress is None or progress < 0.01 or self.finish_at_naive[0] != progress):
or printing_time is None or printing_time < 300): printing_time = self.get_printing_time(eventtime)
return None if (progress is None or progress < 0.05
remaining_time = float(printing_time) / progress * (1. - progress) or printing_time is None or printing_time < 300):
return None
remaining = (1. - progress) / progress
remaining_time = int(round(float(printing_time) * remaining))
self.finish_at_naive = (progress, eventtime + remaining_time)
remaining_time = self.finish_at_naive[1] - eventtime
return max(0, int(round(remaining_time))) return max(0, int(round(remaining_time)))
def get_status(self, eventtime): def get_status(self, eventtime):
@ -227,6 +236,7 @@ class DGUSStatus:
self.finish_at = self.reactor.monotonic() + remaining * 60 self.finish_at = self.reactor.monotonic() + remaining * 60
else: else:
self.finish_at = None self.finish_at = None
self.finish_at_naive = None
if self.M73_original is not None: if self.M73_original is not None:
self.M73_original(gcmd) self.M73_original(gcmd)