From ebf7d574b71b875b6ed24613a1938e006222b91b Mon Sep 17 00:00:00 2001 From: alfrix Date: Sun, 17 Mar 2024 02:41:30 -0300 Subject: [PATCH] job_status: while on auto remaining time bail out of slicer estimation if it's wrong (print is taking longer than slicer estimation) --- panels/job_status.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/panels/job_status.py b/panels/job_status.py index 09e51ac5..f46429c9 100644 --- a/panels/job_status.py +++ b/panels/job_status.py @@ -631,7 +631,7 @@ class Panel(ScreenPanel): elif timeleft_type == "slicer": estimated = slicer_time elif estimated < 1: # Auto - if slicer_time > 1: + if print_duration < slicer_time > 1: if progress < 0.15: # At the begining file and filament are innacurate estimated = slicer_time @@ -641,7 +641,7 @@ class Panel(ScreenPanel): elif file_time > 1: # Weighted arithmetic mean (Slicer is the most accurate) estimated = (slicer_time * 2 + file_time) / 3 - elif filament_time > 1 and file_time > 1: + elif print_duration < filament_time > 1 and file_time > 1: estimated = (filament_time + file_time) / 2 elif file_time > 1: estimated = file_time