CloneRepos/CYD-Klipper
2
0
Fork 0
mirror of https://github.com/suchmememanyskill/CYD-Klipper.git synced 2026-03-21 05:33:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Differentiated between printed and elapsed time (#75)

Browse Source 
Co-authored-by: Kurt Haenen <kurt.haenen@quintux.com>
This commit is contained in:
Kurt Haenen
2024-03-26 21:13:53 +01:00
committed by GitHub
parent 38a1acb7b1
commit ad68095124
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CYD-Klipper/src/core/data_setup.cpp
View File

@@ -214,7 +214,8 @@ void fetch_printer_data()
const char *filename = status["print_stats"]["filename"]; const char *filename = status["print_stats"]["filename"];
strcpy(filename_buff, filename); strcpy(filename_buff, filename);
printer.print_filename = filename_buff; printer.print_filename = filename_buff;
printer.elapsed_time_s = status["print_stats"]["print_duration"]; printer.elapsed_time_s = status["print_stats"]["total_duration"];
printer.printed_time_s = status["print_stats"]["print_duration"];
printer.filament_used_mm = status["print_stats"]["filament_used"]; printer.filament_used_mm = status["print_stats"]["filament_used"];
printer.total_layers = status["print_stats"]["info"]["total_layer"]; printer.total_layers = status["print_stats"]["info"]["total_layer"];
printer.current_layer = status["print_stats"]["info"]["current_layer"]; printer.current_layer = status["print_stats"]["info"]["current_layer"];
@@ -248,12 +249,12 @@ void fetch_printer_data()
if (printer.state == PRINTER_STATE_PRINTING && printer.print_progress > 0) if (printer.state == PRINTER_STATE_PRINTING && printer.print_progress > 0)
{ {
float remaining_time_s_percentage = (printer.elapsed_time_s / printer.print_progress) - printer.elapsed_time_s; float remaining_time_s_percentage = (printer.printed_time_s / printer.print_progress) - printer.printed_time_s;
float remaining_time_s_slicer = 0; float remaining_time_s_slicer = 0;
if (printer.slicer_estimated_print_time_s > 0) if (printer.slicer_estimated_print_time_s > 0)
{ {
remaining_time_s_slicer = printer.slicer_estimated_print_time_s - printer.elapsed_time_s; remaining_time_s_slicer = printer.slicer_estimated_print_time_s - printer.printed_time_s;
} }
if (remaining_time_s_slicer <= 0 || config->remaining_time_calc_mode == REMAINING_TIME_CALC_PERCENTAGE) if (remaining_time_s_slicer <= 0 || config->remaining_time_calc_mode == REMAINING_TIME_CALC_PERCENTAGE)

1
CYD-Klipper/src/core/data_setup.h
View File

@@ -20,6 +20,7 @@ typedef struct _Printer {
unsigned char homed_axis; unsigned char homed_axis;
unsigned char absolute_coords; unsigned char absolute_coords;
float elapsed_time_s; float elapsed_time_s;
float printed_time_s;
float remaining_time_s; float remaining_time_s;
float filament_used_mm; float filament_used_mm;
char* print_filename; char* print_filename;