From 2f02828273bc1c11bb993cf44c7ab91284b18d69 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 7 Sep 2018 02:02:35 +0200 Subject: [PATCH] time remaining fix --- Firmware/Marlin.h | 6 +++--- Firmware/Marlin_main.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 8512de1e..bb40ce76 100644 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -357,13 +357,13 @@ extern bool mmu_print_saved; //estimated time to end of the print extern uint8_t print_percent_done_normal; -extern uint32_t print_time_remaining_normal; +extern uint16_t print_time_remaining_normal; extern uint8_t print_percent_done_silent; -extern uint32_t print_time_remaining_silent; +extern uint16_t print_time_remaining_silent; extern uint16_t mcode_in_progress; extern uint16_t gcode_in_progress; -#define PRINT_TIME_REMAINING_INIT 0xffffffff +#define PRINT_TIME_REMAINING_INIT 0xffff #define PRINT_PERCENT_DONE_INIT 0xff #define PRINTER_ACTIVE (IS_SD_PRINTING || is_usb_printing || isPrintPaused || (custom_message_type == CUSTOM_MSG_TYPE_TEMCAL) || saved_printing || (lcd_commands_type == LCD_COMMAND_V2_CAL) || card.paused || mmu_print_saved) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index cb218019..7d9a5886 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -476,9 +476,9 @@ bool mmu_print_saved = false; // storing estimated time to end of print counted by slicer uint8_t print_percent_done_normal = PRINT_PERCENT_DONE_INIT; -uint32_t print_time_remaining_normal = PRINT_TIME_REMAINING_INIT; //estimated remaining print time in minutes +uint16_t print_time_remaining_normal = PRINT_TIME_REMAINING_INIT; //estimated remaining print time in minutes uint8_t print_percent_done_silent = PRINT_PERCENT_DONE_INIT; -uint32_t print_time_remaining_silent = PRINT_TIME_REMAINING_INIT; //estimated remaining print time in minutes +uint16_t print_time_remaining_silent = PRINT_TIME_REMAINING_INIT; //estimated remaining print time in minutes //=========================================================================== //=============================Private Variables============================= @@ -8859,7 +8859,7 @@ uint16_t print_time_remaining() { uint16_t print_t = PRINT_TIME_REMAINING_INIT; if (SilentModeMenu == SILENT_MODE_OFF) print_t = print_time_remaining_normal; else print_t = print_time_remaining_silent; - if ((print_t != PRINT_TIME_REMAINING_INIT) && (feedmultiply != 0)) print_t = 100 * print_t / feedmultiply; + if ((print_t != PRINT_TIME_REMAINING_INIT) && (feedmultiply != 0)) print_t = 100ul * print_t / feedmultiply; return print_t; }