diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 9cab60609..c17433567 100644 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -349,7 +349,6 @@ extern uint16_t print_time_remaining_silent; #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 == 4) || (lcd_commands_type == LCD_COMMAND_V2_CAL) || card.paused || mmu_print_saved) extern void calculate_extruder_multipliers(); diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index e6c0a071c..ed5c48c1f 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7026,12 +7026,7 @@ void serialecho_temperatures() { uint16_t print_time_remaining() { uint16_t print_t = PRINT_TIME_REMAINING_INIT; -#ifdef TMC2130 - if (SilentModeMenu == SILENT_MODE_OFF) print_t = print_time_remaining_normal; - else print_t = print_time_remaining_silent; -#else print_t = print_time_remaining_normal; -#endif //TMC2130 if ((print_t != PRINT_TIME_REMAINING_INIT) && (feedmultiply != 0)) print_t = 100ul * print_t / feedmultiply; return print_t; } @@ -7039,18 +7034,9 @@ uint16_t print_time_remaining() { uint8_t print_percent_done() { //in case that we have information from M73 gcode return percentage counted by slicer, else return percentage counted as byte_printed/filesize uint8_t percent_done = 0; -#ifdef TMC2130 - if (SilentModeMenu == SILENT_MODE_OFF && print_percent_done_normal <= 100) { - percent_done = print_percent_done_normal; - } - else if (print_percent_done_silent <= 100) { - percent_done = print_percent_done_silent; - } -#else if (print_percent_done_normal <= 100) { percent_done = print_percent_done_normal; } -#endif //TMC2130 else { percent_done = card.percentDone(); }