CreatBot/GeneralKlipperScreen
7
0
Fork 0
forked from CreatBot/CreatBotKlipperScreen
Code Pull Requests Activity

job_status: fix progess of no-extrusion prints (no print_duration reported)

Browse Source
This commit is contained in:
alfrix 2024-03-16 14:23:38 -03:00
parent 445dda6321
commit 082fba4104
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panels/job_status.py
View File

@ -595,8 +595,6 @@ class Panel(ScreenPanel):
def update_time_left(self): def update_time_left(self):
total_duration = float(self._printer.get_stat('print_stats', 'total_duration')) total_duration = float(self._printer.get_stat('print_stats', 'total_duration'))
print_duration = float(self._printer.get_stat('print_stats', 'print_duration')) print_duration = float(self._printer.get_stat('print_stats', 'print_duration'))
if not self.file_metadata.get('filament_total'): # No-extrusion
print_duration = total_duration
fila_used = float(self._printer.get_stat('print_stats', 'filament_used')) fila_used = float(self._printer.get_stat('print_stats', 'filament_used'))
if "gcode_start_byte" in self.file_metadata: if "gcode_start_byte" in self.file_metadata:
progress = (max(self._printer.get_stat('virtual_sdcard', 'file_position') - progress = (max(self._printer.get_stat('virtual_sdcard', 'file_position') -
@ -614,6 +612,10 @@ class Panel(ScreenPanel):
spdcomp = sqrt(self.speed_factor) spdcomp = sqrt(self.speed_factor)
slicer_time = ((self.file_metadata['estimated_time']) / spdcomp) slicer_time = ((self.file_metadata['estimated_time']) / spdcomp)
self.labels["slicer_time"].set_label(self.format_time(slicer_time)) self.labels["slicer_time"].set_label(self.format_time(slicer_time))
if print_duration < 1:
print_duration = slicer_time * progress
elif print_duration < 1: # No-extrusion
print_duration = total_duration
if 'filament_total' in self.file_metadata and self.file_metadata['filament_total'] >= fila_used > 0: if 'filament_total' in self.file_metadata and self.file_metadata['filament_total'] >= fila_used > 0:
filament_time = (print_duration / (fila_used / self.file_metadata['filament_total'])) filament_time = (print_duration / (fila_used / self.file_metadata['filament_total']))