From 0efeedf26274b7a66e21899ab99a5dd70e8ae657 Mon Sep 17 00:00:00 2001 From: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com> Date: Thu, 8 Dec 2022 01:08:53 +0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=B8=20Progress=20display=20followup=20?= =?UTF-8?q?(#24879)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/Configuration_adv.h | 18 +-- Marlin/src/gcode/lcd/M73.cpp | 28 ++--- Marlin/src/lcd/HD44780/marlinui_HD44780.cpp | 20 +-- Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp | 82 ++++++++----- Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 115 ++++++------------ .../lcd/e3v2/marlinui/ui_status_480x272.cpp | 2 + Marlin/src/libs/numtostr.cpp | 6 - 7 files changed, 123 insertions(+), 148 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index c168240e243d..db8bf75b5aa2 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1476,24 +1476,26 @@ #endif // HAS_DISPLAY || DWIN_LCD_PROUI -// Add the G-code 'M73' to set / report the current job progress +// Add 'M73' to set print job progress, overrides Marlin's built-in estimate //#define SET_PROGRESS_MANUALLY #if ENABLED(SET_PROGRESS_MANUALLY) - //#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate - //#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate + #define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done + #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction - #if ENABLED(SET_INTERACTION_TIME) - #define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change) + //#define M73_REPORT // Report M73 values to host + #if BOTH(M73_REPORT, SDSUPPORT) + #define M73_REPORT_SD_ONLY // Report only when printing from SD #endif - //#define M73_REPORT // Report progress to host with 'M73' #endif -// LCD Print Progress options, multiple can be rotated depending on screen layout +// LCD Print Progress options. Multiple times may be displayed in turn. #if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') - + #if ENABLED(SET_INTERACTION_TIME) + #define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change) + #endif //#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this #if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL) diff --git a/Marlin/src/gcode/lcd/M73.cpp b/Marlin/src/gcode/lcd/M73.cpp index 77d93019acaf..02d44ca00be8 100644 --- a/Marlin/src/gcode/lcd/M73.cpp +++ b/Marlin/src/gcode/lcd/M73.cpp @@ -33,10 +33,6 @@ #include "../../lcd/e3v2/proui/dwin.h" #endif -#if ENABLED(M73_REPORT) - #define M73_REPORT_PRUSA -#endif - /** * M73: Set percentage complete (for display on LCD) * @@ -46,10 +42,9 @@ * M73 C12 ; Set next interaction countdown to 12 minutes * M73 ; Report current values * - * Use a shorter-than-Průša report format: - * M73 Percent done: ---%; Time left: -----m; Change: -----m; + * M73 Progress: ---%; Time left: -----m; Change: -----m; * - * When PRINT_PROGRESS_SHOW_DECIMALS is enabled - reports percent with 100 / 23.4 / 3.45 format + * When PRINT_PROGRESS_SHOW_DECIMALS is enabled - reports percent with 100% / 23.4% / 3.45% format * */ void GcodeSuite::M73() { @@ -79,19 +74,20 @@ void GcodeSuite::M73() { #endif #if ENABLED(M73_REPORT) - { - SERIAL_ECHO_MSG( - TERN(M73_REPORT_PRUSA, "M73 Percent done: ", "Progress: ") - , TERN(PRINT_PROGRESS_SHOW_DECIMALS, permyriadtostr4(ui.get_progress_permyriad()), ui.get_progress_percent()) + if (TERN1(M73_REPORT_SD_ONLY, IS_SD_PRINTING())) { + SERIAL_ECHO_START(); + SERIAL_ECHOPGM(" M73"); + #if ENABLED(SET_PROGRESS_PERCENT) + SERIAL_ECHOPGM(" Progress: ", TERN(PRINT_PROGRESS_SHOW_DECIMALS, permyriadtostr4(ui.get_progress_permyriad()), ui.get_progress_percent()), "%;"); + #endif #if ENABLED(SET_REMAINING_TIME) - , TERN(M73_REPORT_PRUSA, "; Print time remaining in mins: ", "%; Time left: "), ui.remaining_time / 60 + SERIAL_ECHOPGM(" Time left: ", ui.remaining_time / 60, "m;"); #endif #if ENABLED(SET_INTERACTION_TIME) - , TERN(M73_REPORT_PRUSA, "; Change in mins: ", "m; Change: "), ui.interaction_time / 60 + SERIAL_ECHOPGM(" Change: ", ui.interaction_time / 60, "m;"); #endif - , TERN(M73_REPORT_PRUSA, ";", "m") - ); - } + SERIAL_EOL(); + } #endif } diff --git a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp index ffbca8def607..9445198a22c1 100644 --- a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp +++ b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp @@ -760,7 +760,7 @@ void MarlinUI::draw_status_message(const bool blink) { #if HAS_PRINT_PROGRESS #define TPOFFSET (LCD_WIDTH - 1) static uint8_t timepos = TPOFFSET - 6; - static char buffer[14]; + static char buffer[8]; static lcd_uint_t pc, pr; #if ENABLED(SHOW_PROGRESS_PERCENT) @@ -776,9 +776,10 @@ void MarlinUI::draw_status_message(const bool blink) { #endif #if ENABLED(SHOW_REMAINING_TIME) void MarlinUI::drawRemain() { - const duration_t remaint = ui.get_remaining_time(); if (printJobOngoing()) { + const duration_t remaint = ui.get_remaining_time(); timepos = TPOFFSET - remaint.toDigital(buffer); + TERN_(NOT(LCD_INFO_SCREEN_STYLE), lcd_put_lchar(timepos - 1, 2, 0x20);) lcd_put_lchar(TERN(LCD_INFO_SCREEN_STYLE, 11, timepos), 2, 'R'); lcd_put_u8str(buffer); } @@ -789,6 +790,7 @@ void MarlinUI::draw_status_message(const bool blink) { const duration_t interactt = ui.interaction_time; if (printingIsActive() && interactt.value) { timepos = TPOFFSET - interactt.toDigital(buffer); + TERN_(NOT(LCD_INFO_SCREEN_STYLE), lcd_put_lchar(timepos - 1, 2, 0x20);) lcd_put_lchar(TERN(LCD_INFO_SCREEN_STYLE, 11, timepos), 2, 'C'); lcd_put_u8str(buffer); } @@ -796,11 +798,11 @@ void MarlinUI::draw_status_message(const bool blink) { #endif #if ENABLED(SHOW_ELAPSED_TIME) void MarlinUI::drawElapsed() { - const duration_t elapsedt = print_job_timer.duration(); if (printJobOngoing()) { + const duration_t elapsedt = print_job_timer.duration(); timepos = TPOFFSET - elapsedt.toDigital(buffer); + TERN_(NOT(LCD_INFO_SCREEN_STYLE), lcd_put_lchar(timepos - 1, 2, 0x20);) lcd_put_lchar(TERN(LCD_INFO_SCREEN_STYLE, 11, timepos), 2, 'E'); - //lcd_put_lchar(timepos, 2, LCD_STR_CLOCK[0]); lcd_put_u8str(buffer); } } @@ -919,7 +921,7 @@ void MarlinUI::draw_status_screen() { #if LCD_WIDTH < 20 #if HAS_PRINT_PROGRESS - pc = 0, pr = 2; + pc = 0; pr = 2; rotate_progress(); #endif @@ -1006,14 +1008,14 @@ void MarlinUI::draw_status_screen() { #if LCD_WIDTH >= 20 #if HAS_PRINT_PROGRESS - pc = timepos - 7, pr = 2; + pc = 6; pr = 2; rotate_progress(); #else char c; uint16_t per; #if HAS_FAN0 if (true - #if EXTRUDERS && ENABLED(ADAPTIVE_FAN_SLOWING) + #if BOTH(HAS_EXTRUDERS, ADAPTIVE_FAN_SLOWING) && (blink || thermalManager.fan_speed_scaler[0] < 128) #endif ) { @@ -1087,7 +1089,7 @@ void MarlinUI::draw_status_screen() { _draw_bed_status(blink); #elif HAS_PRINT_PROGRESS #define DREW_PRINT_PROGRESS 1 - pc = 0, pr = 2; + pc = 0; pr = 2; rotate_progress(); #endif @@ -1095,7 +1097,7 @@ void MarlinUI::draw_status_screen() { // All progress strings // #if HAS_PRINT_PROGRESS && !DREW_PRINT_PROGRESS - pc = LCD_WIDTH - 9, pr = 2; + pc = LCD_WIDTH - 9; pr = 2; rotate_progress(); #endif #endif // LCD_INFO_SCREEN_STYLE 1 diff --git a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp index 1418edf5d17a..e4f9e4eafc08 100644 --- a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp +++ b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp @@ -596,23 +596,58 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const #endif // HAS_CUTTER -#if HAS_PRINT_PROGRESS - - FORCE_INLINE void _draw_print_progress() { - if (!PanelDetected) return; - const uint8_t progress = ui._get_progress(); - #if ENABLED(SDSUPPORT) - lcd_put_u8str(F("SD")); - #elif ENABLED(SET_PROGRESS_PERCENT) - lcd_put_u8str(F("P:")); - #endif - if (progress) - lcd.print(ui8tostr3rj(progress)); - else - lcd_put_u8str(F("---")); - lcd.write('%'); - } +#if HAS_PRINT_PROGRESS // UNTESTED!!! + #define TPOFFSET (LCD_WIDTH - 1) + static uint8_t timepos = TPOFFSET - 6; + + #if ENABLED(SHOW_PROGRESS_PERCENT) + void MarlinUI::drawPercent() { + const uint8_t progress = ui.get_progress_percent(); + if (progress) { + lcd_moveto(0, 2); + lcd_put_u8str(F(TERN(IS_SD_PRINTING, "SD", "P:"))); + lcd.print(TERN(PRINT_PROGRESS_SHOW_DECIMALS, permyriadtostr4(ui.get_progress_permyriad()), ui8tostr3rj(progress))); + lcd.write('%'); + } + } + #endif + #if ENABLED(SHOW_REMAINING_TIME) + void MarlinUI::drawRemain() { + if (printJobOngoing()) { + const duration_t remaint = ui.get_remaining_time(); + char buffer[10]; + timepos = TPOFFSET - remaint.toDigital(buffer); + lcd_moveto(timepos, 1); + lcd.write('R'); + lcd.print(buffer); + } + } + #endif + #if ENABLED(SHOW_INTERACTION_TIME) + void MarlinUI::drawInter() { + const duration_t interactt = ui.interaction_time; + if (printingIsActive() && interactt.value) { + char buffer[10]; + timepos = TPOFFSET - interactt.toDigital(buffer); + lcd_moveto(timepos, 1); + lcd.write('C'); + lcd.print(buffer); + } + } + #endif + #if ENABLED(SHOW_ELAPSED_TIME) + void MarlinUI::drawElapsed() { + if (printJobOngoing()) { + const duration_t elapsedt = print_job_timer.duration(); + char buffer[10]; + timepos = TPOFFSET - elapsedt.toDigital(buffer); + lcd_moveto(timepos, 1); + lcd.write('E'); + lcd.print(buffer); + } + } + #endif #endif // HAS_PRINT_PROGRESS #if ENABLED(LCD_PROGRESS_BAR) @@ -796,23 +831,12 @@ void MarlinUI::draw_status_screen() { #endif // - // Line 2 - feedrate, , time + // Line 2 - feedrate, progress %, progress time // lcd_moveto(0, 1); lcd_put_u8str(F("FR")); lcd.print(i16tostr3rj(feedrate_percentage)); lcd.write('%'); - - #if BOTH(SDSUPPORT, HAS_PRINT_PROGRESS) - lcd_moveto(LCD_WIDTH / 2 - 3, 1); - _draw_print_progress(); - #endif - - char buffer[10]; - duration_t elapsed = print_job_timer.duration(); - uint8_t len = elapsed.toDigital(buffer); - - lcd_moveto((LCD_WIDTH - 1) - len, 1); - lcd.write(LCD_STR_CLOCK[0]); lcd.print(buffer); + ui.rotate_progress(); // UNTESTED!!! // // Line 3 - progressbar diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp index 4283ab59cbde..d0910c44ba5d 100644 --- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp +++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp @@ -445,50 +445,44 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const // Prepare strings for progress display #if HAS_PRINT_PROGRESS - #define _PRGR_INFO_X(len) (LCD_PIXEL_WIDTH - (len) * (MENU_FONT_WIDTH)) - #define PCENTERED 1 // center percent value over progress bar, else align to the right - static uint8_t lastProgress = 0xFF; - static u8g_uint_t progress_bar_solid_width = 0; + static MarlinUI::progress_t progress = 0; + static char bufferc[13]; + + static void prepare_time_string(const duration_t &time, char prefix) { + char str[9]; + memset(&bufferc[2], 0x20, 5); // partialy fill with spaces to avoid artifacts and terminator + bufferc[0] = prefix; + bufferc[1] = ':'; + int str_length = time.toDigital(str, time.value >= 60*60*24L); + strcpy(&bufferc[sizeof(bufferc) - str_length - 1], str); + } + #if ENABLED(SHOW_PROGRESS_PERCENT) - static char progress_string[5]; - static u8g_uint_t progress_x_pos; void MarlinUI::drawPercent() { - if (progress_string[0]) { - lcd_put_u8str(progress_x_pos, EXTRAS_BASELINE, progress_string); - lcd_put_u8str(F("%")); + if (progress != 0) { + #define PCENTERED 1 // center percent value over progress bar, else align to the right + #define PPOS TERN(PCENTERED, 4, 0) + #define PLEN TERN(PRINT_PROGRESS_SHOW_DECIMALS, 4, 3) + memset(&bufferc, 0x20, 12); + memcpy(&bufferc[PPOS], TERN(PRINT_PROGRESS_SHOW_DECIMALS, permyriadtostr4(progress), ui8tostr3rj(progress / (PROGRESS_SCALE))), PLEN); + bufferc[PPOS+PLEN] = '%'; } } #endif #if ENABLED(SHOW_REMAINING_TIME) - static char remaining_string[10]; - static u8g_uint_t remaining_x_pos = 0; void MarlinUI::drawRemain() { - if (printJobOngoing()){ - lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, F("R:")); - lcd_put_u8str(remaining_x_pos, EXTRAS_BASELINE, remaining_string); - } - } + if (printJobOngoing() && get_remaining_time() != 0) + prepare_time_string(get_remaining_time(), 'R'); } #endif #if ENABLED(SHOW_INTERACTION_TIME) - static char interaction_string[10]; - static u8g_uint_t interaction_x_pos = 0; void MarlinUI::drawInter() { - if (printingIsActive() && interaction_string[0]) { - lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, F("C:")); - lcd_put_u8str(interaction_x_pos, EXTRAS_BASELINE, interaction_string); - } - } + if (printingIsActive() && interaction_time) + prepare_time_string(interaction_time, 'C'); } #endif #if ENABLED(SHOW_ELAPSED_TIME) - static char elapsed_string[10]; - static u8g_uint_t elapsed_x_pos = 0; - static uint8_t lastElapsed; void MarlinUI::drawElapsed() { - if (printJobOngoing()) { - lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, F("E:")); - lcd_put_u8str(elapsed_x_pos, EXTRAS_BASELINE, elapsed_string); - } - } + if (printJobOngoing()) + prepare_time_string(print_job_timer.duration(), 'E'); } #endif #endif // HAS_PRINT_PROGRESS @@ -514,6 +508,8 @@ void MarlinUI::draw_status_screen() { const bool show_e_total = TERN0(LCD_SHOW_E_TOTAL, printingIsActive()); + static u8g_uint_t progress_bar_solid_width = 0; + // At the first page, generate new display values if (first_page) { #if ANIM_HBCC @@ -551,59 +547,16 @@ void MarlinUI::draw_status_screen() { strcpy(mstring, i16tostr3rj(planner.volumetric_percent(parser.volumetric_enabled))); #endif - // Progress / elapsed / estimation updates and string formatting to avoid float math on each LCD draw + // Progress update to avoid float math on each LCD draw #if HAS_PRINT_PROGRESS - const progress_t progress = TERN(HAS_PRINT_PROGRESS_PERMYRIAD, get_progress_permyriad, get_progress_percent)(); - duration_t elapsedt = print_job_timer.duration(); - const uint8_t p = progress & 0xFF, ev = elapsedt.value & 0xFF; + progress = TERN(HAS_PRINT_PROGRESS_PERMYRIAD, get_progress_permyriad, get_progress_percent)(); + + static uint8_t lastProgress = 0xFF; + const uint8_t p = progress & 0xFF; if (p != lastProgress) { lastProgress = p; - progress_bar_solid_width = u8g_uint_t((PROGRESS_BAR_WIDTH - 2) * (progress / (PROGRESS_SCALE)) * 0.01f); - - #if ENABLED(SHOW_PROGRESS_PERCENT) - if (progress == 0) - progress_string[0] = '\0'; - else - strcpy(progress_string, TERN(PRINT_PROGRESS_SHOW_DECIMALS, permyriadtostr4(progress), ui8tostr3rj(progress / (PROGRESS_SCALE)))); - progress_x_pos = TERN(PCENTERED, 77, _PRGR_INFO_X(strlen(progress_string) + 1)); - #endif } - - #if ENABLED(SHOW_INTERACTION_TIME) - if (!(interaction_time)) { - interaction_string[0] = '\0'; - interaction_x_pos = _PRGR_INFO_X(0); - } - else { - const duration_t interactt = ui.interaction_time; - interactt.toDigital(interaction_string, interactt.value >= 60*60*24L); - interaction_x_pos = _PRGR_INFO_X(strlen(interaction_string)); - } - #endif - - #if ENABLED(SHOW_ELAPSED_TIME) - if (ev != lastElapsed) { - lastElapsed = ev; - const uint8_t len = elapsedt.toDigital(elapsed_string, elapsedt.value >= 60*60*24L); - elapsed_x_pos = _PRGR_INFO_X(len); - } - #endif - - #if ENABLED(SHOW_REMAINING_TIME) - if (!(ev & 0x3)) { - uint32_t timeval = get_remaining_time(); - if (!timeval) { - remaining_string[0] = '\0'; - remaining_x_pos = _PRGR_INFO_X(0); - } - else { - const duration_t remaint = timeval; - const uint8_t len = remaint.toDigital(remaining_string, remaint.value >= 60*60*24L); - remaining_x_pos = _PRGR_INFO_X(len); - } - } - #endif #endif } @@ -796,8 +749,10 @@ void MarlinUI::draw_status_screen() { u8g.drawBox(PROGRESS_BAR_X + 1, PROGRESS_BAR_Y + 1, progress_bar_solid_width, 2); // Progress strings - if (PAGE_CONTAINS(EXTRAS_BASELINE - INFO_FONT_ASCENT, EXTRAS_BASELINE - 1)) + if (PAGE_CONTAINS(EXTRAS_BASELINE - INFO_FONT_ASCENT, EXTRAS_BASELINE - 1)){ ui.rotate_progress(); + lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, bufferc); + } #endif // diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp index 73de275f9c62..73f4386011e8 100644 --- a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp +++ b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp @@ -366,6 +366,8 @@ void MarlinUI::draw_status_screen() { ); } + // TODO! + // // Elapsed time // diff --git a/Marlin/src/libs/numtostr.cpp b/Marlin/src/libs/numtostr.cpp index 594255aea81e..cd50bffffe1f 100644 --- a/Marlin/src/libs/numtostr.cpp +++ b/Marlin/src/libs/numtostr.cpp @@ -84,12 +84,6 @@ const char* i8tostr3rj(const int8_t x) { conv[6] = DIGIMOD(xx, 10); return &conv[3]; } - else if (xx % 100 == 0) { - conv[4] = ' '; - conv[5] = RJDIGIT(xx, 1000); - conv[6] = DIGIMOD(xx, 100); - return &conv[4]; - } else { conv[3] = DIGIMOD(xx, 100); conv[4] = '.';