From bf850827f7331866940ec778876d1e9d834c05ac Mon Sep 17 00:00:00 2001 From: Robby Candra Date: Wed, 16 Oct 2019 16:18:20 +0700 Subject: [PATCH 01/13] Fix Progress Display --- Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 93 +++++++++++++++------- 1 file changed, 66 insertions(+), 27 deletions(-) diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp index e5ff034132..ce6630efdc 100644 --- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp +++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp @@ -347,9 +347,16 @@ void MarlinUI::draw_status_screen() { static uint8_t lastElapsed = 0, elapsed_x_pos = 0; static char elapsed_string[16]; #if ENABLED(SHOW_REMAINING_TIME) - #define SHOW_REMAINING_TIME_PREFIX 'E' + #define SHOW_REMAINING_TIME_PREFIX 'R' static uint8_t estimation_x_pos = 0; static char estimation_string[10]; + #if ENABLED(DOGM_SD_PERCENT) + #define PROGRESS_TIME_PREFIX 'P' + #define ELAPSED_TIME_PREFIX 'E' + static uint8_t progress_x_pos = 0; + static uint8_t progress_state = 0; + static bool prev_blink = 0; + #endif #endif #endif @@ -401,6 +408,9 @@ void MarlinUI::draw_status_screen() { ui8tostr3(progress / (PROGRESS_SCALE)) #endif )); + #if ENABLED(SHOW_REMAINING_TIME) // Tristate progress display mode + progress_x_pos = _SD_DURATION_X(strlen(progress_string)+1); + #endif #endif } @@ -415,7 +425,11 @@ void MarlinUI::draw_status_screen() { duration_t estimation = elapsed.value * (100 * (PROGRESS_SCALE) - progress) / progress; const bool has_days = (estimation.value >= 60*60*24L); const uint8_t len = estimation.toDigital(estimation_string, has_days); - estimation_x_pos = _SD_DURATION_X(len + 1); + #if ENABLED(DOGM_SD_PERCENT) + estimation_x_pos = _SD_DURATION_X(len); + #else + estimation_x_pos = _SD_DURATION_X(len + 2); + #endif } #endif } @@ -563,35 +577,60 @@ void MarlinUI::draw_status_screen() { if (PAGE_CONTAINS(50, 51)) // 50-51 (or just 50) u8g.drawBox(PROGRESS_BAR_X + 1, 50, progress_bar_solid_width, 2); - // - // SD Percent Complete - // - - #if ENABLED(DOGM_SD_PERCENT) - if (progress_string[0] != '\0') - if (PAGE_CONTAINS(41, 48)) { - // Percent complete - lcd_put_u8str(55, 48, progress_string); - lcd_put_wchar('%'); - } - #endif - - // - // Elapsed Time - // - if (PAGE_CONTAINS(EXTRAS_BASELINE - INFO_FONT_ASCENT, EXTRAS_BASELINE - 1)) { - #if ENABLED(SHOW_REMAINING_TIME) - if (blink && (estimation_string[0] != '\0')) { - lcd_put_wchar(estimation_x_pos, EXTRAS_BASELINE, SHOW_REMAINING_TIME_PREFIX); - lcd_put_u8str(estimation_string); + #if ENABLED(DOGM_SD_PERCENT) && ENABLED(SHOW_REMAINING_TIME) + if (prev_blink != blink) { + prev_blink = blink; + progress_state++; + if (progress_state >=3) progress_state = 0; } - else - #endif - lcd_put_u8str(elapsed_x_pos, EXTRAS_BASELINE, elapsed_string); - } + if (progress_state == 0) { + if (progress_string[0] != '\0') { + lcd_put_wchar(PROGRESS_BAR_X, EXTRAS_BASELINE, PROGRESS_TIME_PREFIX); + lcd_put_u8str(progress_x_pos, EXTRAS_BASELINE, progress_string); + lcd_put_wchar('%'); + } + } + else if (progress_state == 2 && estimation_string[0] != '\0') { + lcd_put_wchar(PROGRESS_BAR_X, EXTRAS_BASELINE, SHOW_REMAINING_TIME_PREFIX); + lcd_put_u8str(estimation_x_pos, EXTRAS_BASELINE, estimation_string); + } + else { + lcd_put_wchar(PROGRESS_BAR_X, EXTRAS_BASELINE, ELAPSED_TIME_PREFIX); + lcd_put_u8str(elapsed_x_pos, EXTRAS_BASELINE, elapsed_string); + } + #else + + // + // SD Percent Complete + // + + #if ENABLED(DOGM_SD_PERCENT) + if (progress_string[0] != '\0') { + // Percent complete + lcd_put_u8str(55, 48, progress_string); + lcd_put_wchar('%'); + } + #endif + + // + // Elapsed Time + // + + #if ENABLED(SHOW_REMAINING_TIME) + if (blink && (estimation_string[0] != '\0')) { + lcd_put_wchar(estimation_x_pos, EXTRAS_BASELINE, SHOW_REMAINING_TIME_PREFIX); + lcd_put_wchar(" "); + lcd_put_u8str(estimation_string); + } + else + #endif + lcd_put_u8str(elapsed_x_pos, EXTRAS_BASELINE, elapsed_string); + + #endif + } #endif // HAS_PRINT_PROGRESS // From 7af99d03d3da2c9f1a9b5c2d3409dd69030ad0e2 Mon Sep 17 00:00:00 2001 From: Robby Candra Date: Wed, 16 Oct 2019 16:25:52 +0700 Subject: [PATCH 02/13] Don't show prefix if no elapsed time --- Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp index ce6630efdc..003da59601 100644 --- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp +++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp @@ -597,7 +597,7 @@ void MarlinUI::draw_status_screen() { lcd_put_wchar(PROGRESS_BAR_X, EXTRAS_BASELINE, SHOW_REMAINING_TIME_PREFIX); lcd_put_u8str(estimation_x_pos, EXTRAS_BASELINE, estimation_string); } - else { + else if (elapsed_string[0] != '\0'){ lcd_put_wchar(PROGRESS_BAR_X, EXTRAS_BASELINE, ELAPSED_TIME_PREFIX); lcd_put_u8str(elapsed_x_pos, EXTRAS_BASELINE, elapsed_string); } From 9b88c3e79b4e8c6225784005c21b186209e0eeb5 Mon Sep 17 00:00:00 2001 From: Robby Candra Date: Thu, 17 Oct 2019 05:26:09 +0700 Subject: [PATCH 03/13] DOGM Progress Display, option to disable display rotation --- Marlin/Configuration_adv.h | 6 ++++-- Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 25 +++++++++++----------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index be8cc57816..8215171309 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -890,8 +890,10 @@ //#define LCD_SET_PROGRESS_MANUALLY #if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + #define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) + #define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + #define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp index 003da59601..a6ffe2f3ca 100644 --- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp +++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp @@ -347,15 +347,17 @@ void MarlinUI::draw_status_screen() { static uint8_t lastElapsed = 0, elapsed_x_pos = 0; static char elapsed_string[16]; #if ENABLED(SHOW_REMAINING_TIME) - #define SHOW_REMAINING_TIME_PREFIX 'R' static uint8_t estimation_x_pos = 0; static char estimation_string[10]; - #if ENABLED(DOGM_SD_PERCENT) - #define PROGRESS_TIME_PREFIX 'P' - #define ELAPSED_TIME_PREFIX 'E' + #if ENABLED(DOGM_SD_PERCENT) && ENABLED(ROTATE_PROGRESS_DISPLAY) + #define PROGRESS_TIME_PREFIX "PROG" + #define ELAPSED_TIME_PREFIX "ELAP" + #define SHOW_REMAINING_TIME_PREFIX "REM" static uint8_t progress_x_pos = 0; static uint8_t progress_state = 0; static bool prev_blink = 0; + #else + #define SHOW_REMAINING_TIME_PREFIX 'R' #endif #endif #endif @@ -408,7 +410,7 @@ void MarlinUI::draw_status_screen() { ui8tostr3(progress / (PROGRESS_SCALE)) #endif )); - #if ENABLED(SHOW_REMAINING_TIME) // Tristate progress display mode + #if ENABLED(SHOW_REMAINING_TIME) && ENABLED(ROTATE_PROGRESS_DISPLAY) // Tristate progress display mode progress_x_pos = _SD_DURATION_X(strlen(progress_string)+1); #endif #endif @@ -425,10 +427,10 @@ void MarlinUI::draw_status_screen() { duration_t estimation = elapsed.value * (100 * (PROGRESS_SCALE) - progress) / progress; const bool has_days = (estimation.value >= 60*60*24L); const uint8_t len = estimation.toDigital(estimation_string, has_days); - #if ENABLED(DOGM_SD_PERCENT) + #if ENABLED(DOGM_SD_PERCENT) && ENABLED(ROTATE_PROGRESS_DISPLAY) estimation_x_pos = _SD_DURATION_X(len); #else - estimation_x_pos = _SD_DURATION_X(len + 2); + estimation_x_pos = _SD_DURATION_X(len + 1); #endif } #endif @@ -579,7 +581,7 @@ void MarlinUI::draw_status_screen() { if (PAGE_CONTAINS(EXTRAS_BASELINE - INFO_FONT_ASCENT, EXTRAS_BASELINE - 1)) { - #if ENABLED(DOGM_SD_PERCENT) && ENABLED(SHOW_REMAINING_TIME) + #if ENABLED(DOGM_SD_PERCENT) && ENABLED(SHOW_REMAINING_TIME) && ENABLED(ROTATE_PROGRESS_DISPLAY) if (prev_blink != blink) { prev_blink = blink; progress_state++; @@ -588,17 +590,17 @@ void MarlinUI::draw_status_screen() { if (progress_state == 0) { if (progress_string[0] != '\0') { - lcd_put_wchar(PROGRESS_BAR_X, EXTRAS_BASELINE, PROGRESS_TIME_PREFIX); + lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, PROGRESS_TIME_PREFIX); lcd_put_u8str(progress_x_pos, EXTRAS_BASELINE, progress_string); lcd_put_wchar('%'); } } else if (progress_state == 2 && estimation_string[0] != '\0') { - lcd_put_wchar(PROGRESS_BAR_X, EXTRAS_BASELINE, SHOW_REMAINING_TIME_PREFIX); + lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, SHOW_REMAINING_TIME_PREFIX); lcd_put_u8str(estimation_x_pos, EXTRAS_BASELINE, estimation_string); } else if (elapsed_string[0] != '\0'){ - lcd_put_wchar(PROGRESS_BAR_X, EXTRAS_BASELINE, ELAPSED_TIME_PREFIX); + lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, ELAPSED_TIME_PREFIX); lcd_put_u8str(elapsed_x_pos, EXTRAS_BASELINE, elapsed_string); } #else @@ -622,7 +624,6 @@ void MarlinUI::draw_status_screen() { #if ENABLED(SHOW_REMAINING_TIME) if (blink && (estimation_string[0] != '\0')) { lcd_put_wchar(estimation_x_pos, EXTRAS_BASELINE, SHOW_REMAINING_TIME_PREFIX); - lcd_put_wchar(" "); lcd_put_u8str(estimation_string); } else From 16ae9ee88bdbbd5f0cf7b0d7c866149b4146ba8a Mon Sep 17 00:00:00 2001 From: Robby Candra Date: Thu, 17 Oct 2019 05:37:22 +0700 Subject: [PATCH 04/13] Update Configuration_adv --- Marlin/Configuration_adv.h | 8 ++++---- config/default/Configuration_adv.h | 2 ++ config/examples/3DFabXYZ/Migbot/Configuration_adv.h | 2 ++ config/examples/ADIMLab/Gantry v1/Configuration_adv.h | 2 ++ config/examples/ADIMLab/Gantry v2/Configuration_adv.h | 2 ++ config/examples/AlephObjects/TAZ4/Configuration_adv.h | 2 ++ config/examples/Alfawise/U20-bltouch/Configuration_adv.h | 2 ++ config/examples/Alfawise/U20/Configuration_adv.h | 2 ++ config/examples/AliExpress/UM2pExt/Configuration_adv.h | 2 ++ config/examples/Anet/A2/Configuration_adv.h | 2 ++ config/examples/Anet/A2plus/Configuration_adv.h | 2 ++ config/examples/Anet/A6/Configuration_adv.h | 2 ++ config/examples/Anet/A8/Configuration_adv.h | 2 ++ config/examples/Anet/A8plus/Configuration_adv.h | 2 ++ config/examples/Anet/E16/Configuration_adv.h | 2 ++ config/examples/AnyCubic/i3/Configuration_adv.h | 2 ++ config/examples/ArmEd/Configuration_adv.h | 2 ++ config/examples/BIBO/TouchX/cyclops/Configuration_adv.h | 2 ++ config/examples/BIBO/TouchX/default/Configuration_adv.h | 2 ++ config/examples/BQ/Hephestos/Configuration_adv.h | 2 ++ config/examples/BQ/Hephestos_2/Configuration_adv.h | 2 ++ config/examples/BQ/WITBOX/Configuration_adv.h | 2 ++ config/examples/Cartesio/Configuration_adv.h | 2 ++ config/examples/Creality/CR-10/Configuration_adv.h | 2 ++ config/examples/Creality/CR-10S/Configuration_adv.h | 2 ++ config/examples/Creality/CR-10_5S/Configuration_adv.h | 2 ++ config/examples/Creality/CR-10mini/Configuration_adv.h | 2 ++ config/examples/Creality/CR-20 Pro/Configuration_adv.h | 2 ++ config/examples/Creality/CR-20/Configuration_adv.h | 2 ++ config/examples/Creality/CR-8/Configuration_adv.h | 2 ++ config/examples/Creality/Ender-2/Configuration_adv.h | 2 ++ config/examples/Creality/Ender-3/Configuration_adv.h | 2 ++ config/examples/Creality/Ender-4/Configuration_adv.h | 2 ++ config/examples/Creality/Ender-5/Configuration_adv.h | 2 ++ config/examples/Dagoma/Disco Ultimate/Configuration_adv.h | 2 ++ .../EVNOVO (Artillery)/Sidewinder X1/Configuration_adv.h | 2 ++ config/examples/Einstart-S/Configuration_adv.h | 2 ++ config/examples/FYSETC/AIO_II/Configuration_adv.h | 2 ++ .../FYSETC/Cheetah 1.2/BLTouch/Configuration_adv.h | 2 ++ .../examples/FYSETC/Cheetah 1.2/base/Configuration_adv.h | 2 ++ .../examples/FYSETC/Cheetah/BLTouch/Configuration_adv.h | 2 ++ config/examples/FYSETC/Cheetah/base/Configuration_adv.h | 2 ++ config/examples/FYSETC/F6_13/Configuration_adv.h | 2 ++ config/examples/Felix/DUAL/Configuration_adv.h | 2 ++ config/examples/Felix/Single/Configuration_adv.h | 2 ++ config/examples/FlashForge/CreatorPro/Configuration_adv.h | 2 ++ config/examples/FolgerTech/i3-2020/Configuration_adv.h | 2 ++ config/examples/Formbot/Raptor/Configuration_adv.h | 2 ++ config/examples/Formbot/T_Rex_3/Configuration_adv.h | 2 ++ config/examples/Geeetech/A10/Configuration_adv.h | 2 ++ config/examples/Geeetech/A10M/Configuration_adv.h | 2 ++ config/examples/Geeetech/A20M/Configuration_adv.h | 2 ++ config/examples/Geeetech/MeCreator2/Configuration_adv.h | 2 ++ .../examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h | 2 ++ .../examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h | 2 ++ config/examples/HMS434/Configuration_adv.h | 2 ++ config/examples/Infitary/i3-M508/Configuration_adv.h | 2 ++ config/examples/JGAurora/A1/Configuration_adv.h | 2 ++ config/examples/JGAurora/A5/Configuration_adv.h | 2 ++ config/examples/JGAurora/A5S/Configuration_adv.h | 2 ++ config/examples/MakerParts/Configuration_adv.h | 2 ++ config/examples/Malyan/M150/Configuration_adv.h | 2 ++ config/examples/Malyan/M200/Configuration_adv.h | 2 ++ config/examples/Micromake/C1/enhanced/Configuration_adv.h | 2 ++ config/examples/Mks/Robin/Configuration_adv.h | 2 ++ config/examples/Mks/Sbase/Configuration_adv.h | 2 ++ config/examples/RapideLite/RL200/Configuration_adv.h | 2 ++ config/examples/RigidBot/Configuration_adv.h | 2 ++ config/examples/SCARA/Configuration_adv.h | 2 ++ .../STM32/Black_STM32F407VET6/Configuration_adv.h | 2 ++ config/examples/Sanguinololu/Configuration_adv.h | 2 ++ config/examples/Tevo/Michelangelo/Configuration_adv.h | 2 ++ config/examples/Tevo/Tarantula Pro/Configuration_adv.h | 2 ++ .../Tevo/Tornado/V1 (MKS Base)/Configuration_adv.h | 2 ++ .../Tevo/Tornado/V2 (MKS GEN-L)/Configuration_adv.h | 2 ++ config/examples/TheBorg/Configuration_adv.h | 2 ++ config/examples/TinyBoy2/Configuration_adv.h | 2 ++ config/examples/Tronxy/X3A/Configuration_adv.h | 2 ++ config/examples/Tronxy/X5S-2E/Configuration_adv.h | 2 ++ config/examples/UltiMachine/Archim1/Configuration_adv.h | 2 ++ config/examples/UltiMachine/Archim2/Configuration_adv.h | 2 ++ config/examples/VORONDesign/Configuration_adv.h | 2 ++ config/examples/Velleman/K8200/Configuration_adv.h | 2 ++ .../examples/Velleman/K8400/Dual-head/Configuration_adv.h | 2 ++ .../Velleman/K8400/Single-head/Configuration_adv.h | 2 ++ config/examples/WASP/PowerWASP/Configuration_adv.h | 2 ++ config/examples/Wanhao/Duplicator 6/Configuration_adv.h | 2 ++ .../Wanhao/Duplicator i3 Mini/Configuration_adv.h | 2 ++ config/examples/delta/Anycubic/Kossel/Configuration_adv.h | 2 ++ .../delta/Dreammaker/Overlord/Configuration_adv.h | 2 ++ .../delta/Dreammaker/Overlord_Pro/Configuration_adv.h | 2 ++ .../delta/FLSUN/auto_calibrate/Configuration_adv.h | 2 ++ config/examples/delta/FLSUN/kossel/Configuration_adv.h | 2 ++ .../examples/delta/FLSUN/kossel_mini/Configuration_adv.h | 2 ++ .../delta/Geeetech/Rostock 301/Configuration_adv.h | 2 ++ config/examples/delta/MKS/SBASE/Configuration_adv.h | 2 ++ .../delta/Tevo Little Monster/Configuration_adv.h | 2 ++ config/examples/delta/generic/Configuration_adv.h | 2 ++ config/examples/delta/kossel_mini/Configuration_adv.h | 2 ++ config/examples/delta/kossel_xl/Configuration_adv.h | 2 ++ config/examples/gCreate/gMax1.5+/Configuration_adv.h | 2 ++ config/examples/makibox/Configuration_adv.h | 2 ++ config/examples/tvrrug/Round2/Configuration_adv.h | 2 ++ config/examples/wt150/Configuration_adv.h | 2 ++ 104 files changed, 210 insertions(+), 4 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 8215171309..5ccf208471 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -890,10 +890,10 @@ //#define LCD_SET_PROGRESS_MANUALLY #if HAS_PRINT_PROGRESS - #define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - #define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - #define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) + //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/default/Configuration_adv.h b/config/default/Configuration_adv.h index be8cc57816..c0b776987b 100644 --- a/config/default/Configuration_adv.h +++ b/config/default/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/3DFabXYZ/Migbot/Configuration_adv.h b/config/examples/3DFabXYZ/Migbot/Configuration_adv.h index 9c6f19e5ea..a57a76d2b6 100644 --- a/config/examples/3DFabXYZ/Migbot/Configuration_adv.h +++ b/config/examples/3DFabXYZ/Migbot/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/ADIMLab/Gantry v1/Configuration_adv.h b/config/examples/ADIMLab/Gantry v1/Configuration_adv.h index 76eaee3bbf..3ec41f364d 100644 --- a/config/examples/ADIMLab/Gantry v1/Configuration_adv.h +++ b/config/examples/ADIMLab/Gantry v1/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/ADIMLab/Gantry v2/Configuration_adv.h b/config/examples/ADIMLab/Gantry v2/Configuration_adv.h index c7c46e926f..8441dee687 100644 --- a/config/examples/ADIMLab/Gantry v2/Configuration_adv.h +++ b/config/examples/ADIMLab/Gantry v2/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/AlephObjects/TAZ4/Configuration_adv.h b/config/examples/AlephObjects/TAZ4/Configuration_adv.h index 48649c6c80..55bbd2098a 100644 --- a/config/examples/AlephObjects/TAZ4/Configuration_adv.h +++ b/config/examples/AlephObjects/TAZ4/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Alfawise/U20-bltouch/Configuration_adv.h b/config/examples/Alfawise/U20-bltouch/Configuration_adv.h index 30b495a7d3..ff44ea42dd 100644 --- a/config/examples/Alfawise/U20-bltouch/Configuration_adv.h +++ b/config/examples/Alfawise/U20-bltouch/Configuration_adv.h @@ -893,6 +893,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Alfawise/U20/Configuration_adv.h b/config/examples/Alfawise/U20/Configuration_adv.h index fdf956ca38..8c4419ab54 100644 --- a/config/examples/Alfawise/U20/Configuration_adv.h +++ b/config/examples/Alfawise/U20/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/AliExpress/UM2pExt/Configuration_adv.h b/config/examples/AliExpress/UM2pExt/Configuration_adv.h index cb042e01f0..61891d65d6 100644 --- a/config/examples/AliExpress/UM2pExt/Configuration_adv.h +++ b/config/examples/AliExpress/UM2pExt/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Anet/A2/Configuration_adv.h b/config/examples/Anet/A2/Configuration_adv.h index cb564592e9..ceddb2b391 100644 --- a/config/examples/Anet/A2/Configuration_adv.h +++ b/config/examples/Anet/A2/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Anet/A2plus/Configuration_adv.h b/config/examples/Anet/A2plus/Configuration_adv.h index cb564592e9..ceddb2b391 100644 --- a/config/examples/Anet/A2plus/Configuration_adv.h +++ b/config/examples/Anet/A2plus/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Anet/A6/Configuration_adv.h b/config/examples/Anet/A6/Configuration_adv.h index 32c24672e7..a8326ca930 100644 --- a/config/examples/Anet/A6/Configuration_adv.h +++ b/config/examples/Anet/A6/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Anet/A8/Configuration_adv.h b/config/examples/Anet/A8/Configuration_adv.h index e18a43a9a8..84244ac61d 100644 --- a/config/examples/Anet/A8/Configuration_adv.h +++ b/config/examples/Anet/A8/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Anet/A8plus/Configuration_adv.h b/config/examples/Anet/A8plus/Configuration_adv.h index 313226f589..121e998bbb 100644 --- a/config/examples/Anet/A8plus/Configuration_adv.h +++ b/config/examples/Anet/A8plus/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Anet/E16/Configuration_adv.h b/config/examples/Anet/E16/Configuration_adv.h index e9360c9083..982423a738 100644 --- a/config/examples/Anet/E16/Configuration_adv.h +++ b/config/examples/Anet/E16/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/AnyCubic/i3/Configuration_adv.h b/config/examples/AnyCubic/i3/Configuration_adv.h index 166e563412..7853c0d302 100644 --- a/config/examples/AnyCubic/i3/Configuration_adv.h +++ b/config/examples/AnyCubic/i3/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/ArmEd/Configuration_adv.h b/config/examples/ArmEd/Configuration_adv.h index 752c3e14c8..43ecbd9d3b 100644 --- a/config/examples/ArmEd/Configuration_adv.h +++ b/config/examples/ArmEd/Configuration_adv.h @@ -896,6 +896,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h b/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h index f6bea9d21a..704febe7ba 100644 --- a/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h +++ b/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/BIBO/TouchX/default/Configuration_adv.h b/config/examples/BIBO/TouchX/default/Configuration_adv.h index 0fea3b9d4d..6735d7c4c2 100644 --- a/config/examples/BIBO/TouchX/default/Configuration_adv.h +++ b/config/examples/BIBO/TouchX/default/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/BQ/Hephestos/Configuration_adv.h b/config/examples/BQ/Hephestos/Configuration_adv.h index 378f838fe7..35877dcfee 100644 --- a/config/examples/BQ/Hephestos/Configuration_adv.h +++ b/config/examples/BQ/Hephestos/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/BQ/Hephestos_2/Configuration_adv.h b/config/examples/BQ/Hephestos_2/Configuration_adv.h index 846fa6d6ef..2890c00eaa 100644 --- a/config/examples/BQ/Hephestos_2/Configuration_adv.h +++ b/config/examples/BQ/Hephestos_2/Configuration_adv.h @@ -900,6 +900,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/BQ/WITBOX/Configuration_adv.h b/config/examples/BQ/WITBOX/Configuration_adv.h index 378f838fe7..35877dcfee 100644 --- a/config/examples/BQ/WITBOX/Configuration_adv.h +++ b/config/examples/BQ/WITBOX/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Cartesio/Configuration_adv.h b/config/examples/Cartesio/Configuration_adv.h index a2ead624f1..08df970ac3 100644 --- a/config/examples/Cartesio/Configuration_adv.h +++ b/config/examples/Cartesio/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Creality/CR-10/Configuration_adv.h b/config/examples/Creality/CR-10/Configuration_adv.h index c8d88708a5..68eb7cc004 100644 --- a/config/examples/Creality/CR-10/Configuration_adv.h +++ b/config/examples/Creality/CR-10/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Creality/CR-10S/Configuration_adv.h b/config/examples/Creality/CR-10S/Configuration_adv.h index a8c44a3096..fe66bbb7e5 100644 --- a/config/examples/Creality/CR-10S/Configuration_adv.h +++ b/config/examples/Creality/CR-10S/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Creality/CR-10_5S/Configuration_adv.h b/config/examples/Creality/CR-10_5S/Configuration_adv.h index 4db8c109ef..393f1bfdba 100644 --- a/config/examples/Creality/CR-10_5S/Configuration_adv.h +++ b/config/examples/Creality/CR-10_5S/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Creality/CR-10mini/Configuration_adv.h b/config/examples/Creality/CR-10mini/Configuration_adv.h index 890da094d6..17c3b6d046 100644 --- a/config/examples/Creality/CR-10mini/Configuration_adv.h +++ b/config/examples/Creality/CR-10mini/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Creality/CR-20 Pro/Configuration_adv.h b/config/examples/Creality/CR-20 Pro/Configuration_adv.h index d5b9e7496d..1897433613 100644 --- a/config/examples/Creality/CR-20 Pro/Configuration_adv.h +++ b/config/examples/Creality/CR-20 Pro/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Creality/CR-20/Configuration_adv.h b/config/examples/Creality/CR-20/Configuration_adv.h index fd8bc17b40..55f468acac 100644 --- a/config/examples/Creality/CR-20/Configuration_adv.h +++ b/config/examples/Creality/CR-20/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Creality/CR-8/Configuration_adv.h b/config/examples/Creality/CR-8/Configuration_adv.h index 781f660665..6ddcf54265 100644 --- a/config/examples/Creality/CR-8/Configuration_adv.h +++ b/config/examples/Creality/CR-8/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Creality/Ender-2/Configuration_adv.h b/config/examples/Creality/Ender-2/Configuration_adv.h index 91155e7fc9..b751207f75 100644 --- a/config/examples/Creality/Ender-2/Configuration_adv.h +++ b/config/examples/Creality/Ender-2/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Creality/Ender-3/Configuration_adv.h b/config/examples/Creality/Ender-3/Configuration_adv.h index 204d2c2526..903d213213 100644 --- a/config/examples/Creality/Ender-3/Configuration_adv.h +++ b/config/examples/Creality/Ender-3/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Creality/Ender-4/Configuration_adv.h b/config/examples/Creality/Ender-4/Configuration_adv.h index 002864dfdd..bd2144ebc9 100644 --- a/config/examples/Creality/Ender-4/Configuration_adv.h +++ b/config/examples/Creality/Ender-4/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Creality/Ender-5/Configuration_adv.h b/config/examples/Creality/Ender-5/Configuration_adv.h index 378b9dbe6d..b541f2e9d2 100644 --- a/config/examples/Creality/Ender-5/Configuration_adv.h +++ b/config/examples/Creality/Ender-5/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Dagoma/Disco Ultimate/Configuration_adv.h b/config/examples/Dagoma/Disco Ultimate/Configuration_adv.h index 56ed4b2a8e..440c9fa665 100644 --- a/config/examples/Dagoma/Disco Ultimate/Configuration_adv.h +++ b/config/examples/Dagoma/Disco Ultimate/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/EVNOVO (Artillery)/Sidewinder X1/Configuration_adv.h b/config/examples/EVNOVO (Artillery)/Sidewinder X1/Configuration_adv.h index ecc8950f6f..bc5a1eb763 100755 --- a/config/examples/EVNOVO (Artillery)/Sidewinder X1/Configuration_adv.h +++ b/config/examples/EVNOVO (Artillery)/Sidewinder X1/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Einstart-S/Configuration_adv.h b/config/examples/Einstart-S/Configuration_adv.h index ecc2629008..0a8d34ddc4 100644 --- a/config/examples/Einstart-S/Configuration_adv.h +++ b/config/examples/Einstart-S/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/FYSETC/AIO_II/Configuration_adv.h b/config/examples/FYSETC/AIO_II/Configuration_adv.h index d52e7eabfe..0c7fa4782d 100644 --- a/config/examples/FYSETC/AIO_II/Configuration_adv.h +++ b/config/examples/FYSETC/AIO_II/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/FYSETC/Cheetah 1.2/BLTouch/Configuration_adv.h b/config/examples/FYSETC/Cheetah 1.2/BLTouch/Configuration_adv.h index cfdc435786..1878fcf897 100644 --- a/config/examples/FYSETC/Cheetah 1.2/BLTouch/Configuration_adv.h +++ b/config/examples/FYSETC/Cheetah 1.2/BLTouch/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/FYSETC/Cheetah 1.2/base/Configuration_adv.h b/config/examples/FYSETC/Cheetah 1.2/base/Configuration_adv.h index cfdc435786..1878fcf897 100644 --- a/config/examples/FYSETC/Cheetah 1.2/base/Configuration_adv.h +++ b/config/examples/FYSETC/Cheetah 1.2/base/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/FYSETC/Cheetah/BLTouch/Configuration_adv.h b/config/examples/FYSETC/Cheetah/BLTouch/Configuration_adv.h index cfdc435786..1878fcf897 100644 --- a/config/examples/FYSETC/Cheetah/BLTouch/Configuration_adv.h +++ b/config/examples/FYSETC/Cheetah/BLTouch/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/FYSETC/Cheetah/base/Configuration_adv.h b/config/examples/FYSETC/Cheetah/base/Configuration_adv.h index cfdc435786..1878fcf897 100644 --- a/config/examples/FYSETC/Cheetah/base/Configuration_adv.h +++ b/config/examples/FYSETC/Cheetah/base/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/FYSETC/F6_13/Configuration_adv.h b/config/examples/FYSETC/F6_13/Configuration_adv.h index 7dafbc86f7..5e370b6504 100644 --- a/config/examples/FYSETC/F6_13/Configuration_adv.h +++ b/config/examples/FYSETC/F6_13/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Felix/DUAL/Configuration_adv.h b/config/examples/Felix/DUAL/Configuration_adv.h index 9691273bfc..33891aadca 100644 --- a/config/examples/Felix/DUAL/Configuration_adv.h +++ b/config/examples/Felix/DUAL/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Felix/Single/Configuration_adv.h b/config/examples/Felix/Single/Configuration_adv.h index 9691273bfc..33891aadca 100644 --- a/config/examples/Felix/Single/Configuration_adv.h +++ b/config/examples/Felix/Single/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/FlashForge/CreatorPro/Configuration_adv.h b/config/examples/FlashForge/CreatorPro/Configuration_adv.h index 3a986a2138..b3810046b4 100644 --- a/config/examples/FlashForge/CreatorPro/Configuration_adv.h +++ b/config/examples/FlashForge/CreatorPro/Configuration_adv.h @@ -891,6 +891,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/FolgerTech/i3-2020/Configuration_adv.h b/config/examples/FolgerTech/i3-2020/Configuration_adv.h index 3a2d817581..39b1299ed8 100644 --- a/config/examples/FolgerTech/i3-2020/Configuration_adv.h +++ b/config/examples/FolgerTech/i3-2020/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Formbot/Raptor/Configuration_adv.h b/config/examples/Formbot/Raptor/Configuration_adv.h index b37f3d0de5..edcfe9e3b8 100644 --- a/config/examples/Formbot/Raptor/Configuration_adv.h +++ b/config/examples/Formbot/Raptor/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Formbot/T_Rex_3/Configuration_adv.h b/config/examples/Formbot/T_Rex_3/Configuration_adv.h index e51fee2c35..a323e19a8a 100644 --- a/config/examples/Formbot/T_Rex_3/Configuration_adv.h +++ b/config/examples/Formbot/T_Rex_3/Configuration_adv.h @@ -896,6 +896,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Geeetech/A10/Configuration_adv.h b/config/examples/Geeetech/A10/Configuration_adv.h index a502b63cdf..deac5d11bf 100644 --- a/config/examples/Geeetech/A10/Configuration_adv.h +++ b/config/examples/Geeetech/A10/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Geeetech/A10M/Configuration_adv.h b/config/examples/Geeetech/A10M/Configuration_adv.h index b2f2ea41b2..c5bcb002dd 100644 --- a/config/examples/Geeetech/A10M/Configuration_adv.h +++ b/config/examples/Geeetech/A10M/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Geeetech/A20M/Configuration_adv.h b/config/examples/Geeetech/A20M/Configuration_adv.h index 285ed5d9ab..00c90a81f1 100644 --- a/config/examples/Geeetech/A20M/Configuration_adv.h +++ b/config/examples/Geeetech/A20M/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Geeetech/MeCreator2/Configuration_adv.h b/config/examples/Geeetech/MeCreator2/Configuration_adv.h index 95ae32e816..4e67c4fc3c 100644 --- a/config/examples/Geeetech/MeCreator2/Configuration_adv.h +++ b/config/examples/Geeetech/MeCreator2/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h b/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h index a502b63cdf..deac5d11bf 100644 --- a/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h +++ b/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h b/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h index a502b63cdf..deac5d11bf 100644 --- a/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h +++ b/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/HMS434/Configuration_adv.h b/config/examples/HMS434/Configuration_adv.h index 0ab6fe34fa..ac9e641dd0 100644 --- a/config/examples/HMS434/Configuration_adv.h +++ b/config/examples/HMS434/Configuration_adv.h @@ -860,6 +860,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Infitary/i3-M508/Configuration_adv.h b/config/examples/Infitary/i3-M508/Configuration_adv.h index e0371b73fd..cbc4b16178 100644 --- a/config/examples/Infitary/i3-M508/Configuration_adv.h +++ b/config/examples/Infitary/i3-M508/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/JGAurora/A1/Configuration_adv.h b/config/examples/JGAurora/A1/Configuration_adv.h index 8904cc60c2..c13006e201 100644 --- a/config/examples/JGAurora/A1/Configuration_adv.h +++ b/config/examples/JGAurora/A1/Configuration_adv.h @@ -897,6 +897,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/JGAurora/A5/Configuration_adv.h b/config/examples/JGAurora/A5/Configuration_adv.h index 5a999ae818..149e77c618 100644 --- a/config/examples/JGAurora/A5/Configuration_adv.h +++ b/config/examples/JGAurora/A5/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/JGAurora/A5S/Configuration_adv.h b/config/examples/JGAurora/A5S/Configuration_adv.h index 8904cc60c2..c13006e201 100644 --- a/config/examples/JGAurora/A5S/Configuration_adv.h +++ b/config/examples/JGAurora/A5S/Configuration_adv.h @@ -897,6 +897,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/MakerParts/Configuration_adv.h b/config/examples/MakerParts/Configuration_adv.h index 01d0dcd1eb..8aafd146a4 100644 --- a/config/examples/MakerParts/Configuration_adv.h +++ b/config/examples/MakerParts/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Malyan/M150/Configuration_adv.h b/config/examples/Malyan/M150/Configuration_adv.h index 0b63942a74..dff29f18ee 100644 --- a/config/examples/Malyan/M150/Configuration_adv.h +++ b/config/examples/Malyan/M150/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Malyan/M200/Configuration_adv.h b/config/examples/Malyan/M200/Configuration_adv.h index d74cef3867..e3f78e51f4 100644 --- a/config/examples/Malyan/M200/Configuration_adv.h +++ b/config/examples/Malyan/M200/Configuration_adv.h @@ -894,6 +894,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Micromake/C1/enhanced/Configuration_adv.h b/config/examples/Micromake/C1/enhanced/Configuration_adv.h index afc78f5afd..4bd182488d 100644 --- a/config/examples/Micromake/C1/enhanced/Configuration_adv.h +++ b/config/examples/Micromake/C1/enhanced/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Mks/Robin/Configuration_adv.h b/config/examples/Mks/Robin/Configuration_adv.h index 7ec4434958..a530db5a9e 100644 --- a/config/examples/Mks/Robin/Configuration_adv.h +++ b/config/examples/Mks/Robin/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Mks/Sbase/Configuration_adv.h b/config/examples/Mks/Sbase/Configuration_adv.h index 2b9459adfe..643d5b8871 100644 --- a/config/examples/Mks/Sbase/Configuration_adv.h +++ b/config/examples/Mks/Sbase/Configuration_adv.h @@ -893,6 +893,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/RapideLite/RL200/Configuration_adv.h b/config/examples/RapideLite/RL200/Configuration_adv.h index e9c7c90c06..dc692dfb24 100644 --- a/config/examples/RapideLite/RL200/Configuration_adv.h +++ b/config/examples/RapideLite/RL200/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/RigidBot/Configuration_adv.h b/config/examples/RigidBot/Configuration_adv.h index a7bc7a0f35..69171cc267 100644 --- a/config/examples/RigidBot/Configuration_adv.h +++ b/config/examples/RigidBot/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/SCARA/Configuration_adv.h b/config/examples/SCARA/Configuration_adv.h index 06a442a1c5..23e257d45b 100644 --- a/config/examples/SCARA/Configuration_adv.h +++ b/config/examples/SCARA/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/STM32/Black_STM32F407VET6/Configuration_adv.h b/config/examples/STM32/Black_STM32F407VET6/Configuration_adv.h index 73e0cdebd1..332dcc6dd9 100644 --- a/config/examples/STM32/Black_STM32F407VET6/Configuration_adv.h +++ b/config/examples/STM32/Black_STM32F407VET6/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Sanguinololu/Configuration_adv.h b/config/examples/Sanguinololu/Configuration_adv.h index 76dffa229d..cc03cebe53 100644 --- a/config/examples/Sanguinololu/Configuration_adv.h +++ b/config/examples/Sanguinololu/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Tevo/Michelangelo/Configuration_adv.h b/config/examples/Tevo/Michelangelo/Configuration_adv.h index 9c543274ce..cc342b0f84 100644 --- a/config/examples/Tevo/Michelangelo/Configuration_adv.h +++ b/config/examples/Tevo/Michelangelo/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Tevo/Tarantula Pro/Configuration_adv.h b/config/examples/Tevo/Tarantula Pro/Configuration_adv.h index 6f1c5359bc..dea84faef6 100755 --- a/config/examples/Tevo/Tarantula Pro/Configuration_adv.h +++ b/config/examples/Tevo/Tarantula Pro/Configuration_adv.h @@ -888,6 +888,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Tevo/Tornado/V1 (MKS Base)/Configuration_adv.h b/config/examples/Tevo/Tornado/V1 (MKS Base)/Configuration_adv.h index ff8f516b72..f2966e6fad 100755 --- a/config/examples/Tevo/Tornado/V1 (MKS Base)/Configuration_adv.h +++ b/config/examples/Tevo/Tornado/V1 (MKS Base)/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Tevo/Tornado/V2 (MKS GEN-L)/Configuration_adv.h b/config/examples/Tevo/Tornado/V2 (MKS GEN-L)/Configuration_adv.h index ff8f516b72..f2966e6fad 100755 --- a/config/examples/Tevo/Tornado/V2 (MKS GEN-L)/Configuration_adv.h +++ b/config/examples/Tevo/Tornado/V2 (MKS GEN-L)/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/TheBorg/Configuration_adv.h b/config/examples/TheBorg/Configuration_adv.h index 6507e02c47..bbb4892769 100644 --- a/config/examples/TheBorg/Configuration_adv.h +++ b/config/examples/TheBorg/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/TinyBoy2/Configuration_adv.h b/config/examples/TinyBoy2/Configuration_adv.h index 30f8b946a3..1ea9e58a2c 100644 --- a/config/examples/TinyBoy2/Configuration_adv.h +++ b/config/examples/TinyBoy2/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Tronxy/X3A/Configuration_adv.h b/config/examples/Tronxy/X3A/Configuration_adv.h index fccd1ce20d..e177f71aee 100644 --- a/config/examples/Tronxy/X3A/Configuration_adv.h +++ b/config/examples/Tronxy/X3A/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Tronxy/X5S-2E/Configuration_adv.h b/config/examples/Tronxy/X5S-2E/Configuration_adv.h index 5bb73f5010..f10d493ef1 100644 --- a/config/examples/Tronxy/X5S-2E/Configuration_adv.h +++ b/config/examples/Tronxy/X5S-2E/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/UltiMachine/Archim1/Configuration_adv.h b/config/examples/UltiMachine/Archim1/Configuration_adv.h index 008894701c..f2b87306f3 100644 --- a/config/examples/UltiMachine/Archim1/Configuration_adv.h +++ b/config/examples/UltiMachine/Archim1/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/UltiMachine/Archim2/Configuration_adv.h b/config/examples/UltiMachine/Archim2/Configuration_adv.h index 7ea2ed4c9e..2019f390e3 100644 --- a/config/examples/UltiMachine/Archim2/Configuration_adv.h +++ b/config/examples/UltiMachine/Archim2/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/VORONDesign/Configuration_adv.h b/config/examples/VORONDesign/Configuration_adv.h index a43aa837bb..2ba5d4dda9 100644 --- a/config/examples/VORONDesign/Configuration_adv.h +++ b/config/examples/VORONDesign/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Velleman/K8200/Configuration_adv.h b/config/examples/Velleman/K8200/Configuration_adv.h index 5470bfa0ba..bf0320c971 100644 --- a/config/examples/Velleman/K8200/Configuration_adv.h +++ b/config/examples/Velleman/K8200/Configuration_adv.h @@ -905,6 +905,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Velleman/K8400/Dual-head/Configuration_adv.h b/config/examples/Velleman/K8400/Dual-head/Configuration_adv.h index 6cef04b95c..c888c428fa 100644 --- a/config/examples/Velleman/K8400/Dual-head/Configuration_adv.h +++ b/config/examples/Velleman/K8400/Dual-head/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Velleman/K8400/Single-head/Configuration_adv.h b/config/examples/Velleman/K8400/Single-head/Configuration_adv.h index 6cef04b95c..c888c428fa 100644 --- a/config/examples/Velleman/K8400/Single-head/Configuration_adv.h +++ b/config/examples/Velleman/K8400/Single-head/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/WASP/PowerWASP/Configuration_adv.h b/config/examples/WASP/PowerWASP/Configuration_adv.h index f34f25f078..bf792a113f 100644 --- a/config/examples/WASP/PowerWASP/Configuration_adv.h +++ b/config/examples/WASP/PowerWASP/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Wanhao/Duplicator 6/Configuration_adv.h b/config/examples/Wanhao/Duplicator 6/Configuration_adv.h index 5bd3a5ed07..da9e688e97 100644 --- a/config/examples/Wanhao/Duplicator 6/Configuration_adv.h +++ b/config/examples/Wanhao/Duplicator 6/Configuration_adv.h @@ -894,6 +894,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Wanhao/Duplicator i3 Mini/Configuration_adv.h b/config/examples/Wanhao/Duplicator i3 Mini/Configuration_adv.h index b2d5705296..b27cae440a 100644 --- a/config/examples/Wanhao/Duplicator i3 Mini/Configuration_adv.h +++ b/config/examples/Wanhao/Duplicator i3 Mini/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/delta/Anycubic/Kossel/Configuration_adv.h b/config/examples/delta/Anycubic/Kossel/Configuration_adv.h index 7933fbca86..ac8bdfe226 100644 --- a/config/examples/delta/Anycubic/Kossel/Configuration_adv.h +++ b/config/examples/delta/Anycubic/Kossel/Configuration_adv.h @@ -894,6 +894,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/delta/Dreammaker/Overlord/Configuration_adv.h b/config/examples/delta/Dreammaker/Overlord/Configuration_adv.h index a557f80363..f856c4fc32 100644 --- a/config/examples/delta/Dreammaker/Overlord/Configuration_adv.h +++ b/config/examples/delta/Dreammaker/Overlord/Configuration_adv.h @@ -894,6 +894,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/delta/Dreammaker/Overlord_Pro/Configuration_adv.h b/config/examples/delta/Dreammaker/Overlord_Pro/Configuration_adv.h index a557f80363..f856c4fc32 100644 --- a/config/examples/delta/Dreammaker/Overlord_Pro/Configuration_adv.h +++ b/config/examples/delta/Dreammaker/Overlord_Pro/Configuration_adv.h @@ -894,6 +894,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h b/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h index 05e35a6362..7d5b0e13ca 100644 --- a/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h +++ b/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h @@ -894,6 +894,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/delta/FLSUN/kossel/Configuration_adv.h b/config/examples/delta/FLSUN/kossel/Configuration_adv.h index 05e35a6362..7d5b0e13ca 100644 --- a/config/examples/delta/FLSUN/kossel/Configuration_adv.h +++ b/config/examples/delta/FLSUN/kossel/Configuration_adv.h @@ -894,6 +894,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h b/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h index 2b69997152..fc2a329ae7 100644 --- a/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h +++ b/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h @@ -894,6 +894,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h b/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h index 696a961944..45e05f58ef 100644 --- a/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h +++ b/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h @@ -894,6 +894,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/delta/MKS/SBASE/Configuration_adv.h b/config/examples/delta/MKS/SBASE/Configuration_adv.h index b9f6b65a98..45a336cf81 100644 --- a/config/examples/delta/MKS/SBASE/Configuration_adv.h +++ b/config/examples/delta/MKS/SBASE/Configuration_adv.h @@ -894,6 +894,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/delta/Tevo Little Monster/Configuration_adv.h b/config/examples/delta/Tevo Little Monster/Configuration_adv.h index 8c36e633d6..f2c6729846 100644 --- a/config/examples/delta/Tevo Little Monster/Configuration_adv.h +++ b/config/examples/delta/Tevo Little Monster/Configuration_adv.h @@ -894,6 +894,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/delta/generic/Configuration_adv.h b/config/examples/delta/generic/Configuration_adv.h index 2b69997152..fc2a329ae7 100644 --- a/config/examples/delta/generic/Configuration_adv.h +++ b/config/examples/delta/generic/Configuration_adv.h @@ -894,6 +894,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/delta/kossel_mini/Configuration_adv.h b/config/examples/delta/kossel_mini/Configuration_adv.h index 2b69997152..fc2a329ae7 100644 --- a/config/examples/delta/kossel_mini/Configuration_adv.h +++ b/config/examples/delta/kossel_mini/Configuration_adv.h @@ -894,6 +894,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/delta/kossel_xl/Configuration_adv.h b/config/examples/delta/kossel_xl/Configuration_adv.h index 160d4b1292..09ac1b71df 100644 --- a/config/examples/delta/kossel_xl/Configuration_adv.h +++ b/config/examples/delta/kossel_xl/Configuration_adv.h @@ -894,6 +894,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/gCreate/gMax1.5+/Configuration_adv.h b/config/examples/gCreate/gMax1.5+/Configuration_adv.h index e8a4d02807..54f13ab798 100644 --- a/config/examples/gCreate/gMax1.5+/Configuration_adv.h +++ b/config/examples/gCreate/gMax1.5+/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/makibox/Configuration_adv.h b/config/examples/makibox/Configuration_adv.h index 655e9e769c..07e840e61f 100644 --- a/config/examples/makibox/Configuration_adv.h +++ b/config/examples/makibox/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/tvrrug/Round2/Configuration_adv.h b/config/examples/tvrrug/Round2/Configuration_adv.h index ccfc0da921..db31cb3d0a 100644 --- a/config/examples/tvrrug/Round2/Configuration_adv.h +++ b/config/examples/tvrrug/Round2/Configuration_adv.h @@ -892,6 +892,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/wt150/Configuration_adv.h b/config/examples/wt150/Configuration_adv.h index f5936e6ca3..cae60d5b33 100644 --- a/config/examples/wt150/Configuration_adv.h +++ b/config/examples/wt150/Configuration_adv.h @@ -893,6 +893,8 @@ #if HAS_PRINT_PROGRESS //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) + //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, + // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS From 6241bcf0c8555f1277a6bde5c7a5d73a1019dfc1 Mon Sep 17 00:00:00 2001 From: Robby Candra Date: Sun, 20 Oct 2019 06:06:48 +0700 Subject: [PATCH 05/13] Fix Progress at the end of print. --- Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 33 +++++++++++++--------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp index a6ffe2f3ca..752413a68c 100644 --- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp +++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp @@ -340,20 +340,20 @@ void MarlinUI::draw_status_screen() { #define _SD_DURATION_X(len) (LCD_PIXEL_WIDTH - (len) * (MENU_FONT_WIDTH)) #endif - static uint8_t progress_bar_solid_width = 0, lastProgress = 0; #if ENABLED(DOGM_SD_PERCENT) static char progress_string[5]; #endif - static uint8_t lastElapsed = 0, elapsed_x_pos = 0; + static uint8_t lastElapsed = 0, lastProgress = 0; + static u8g_uint_t elapsed_x_pos = 0, progress_bar_solid_width = 0; static char elapsed_string[16]; #if ENABLED(SHOW_REMAINING_TIME) - static uint8_t estimation_x_pos = 0; + static u8g_uint_t estimation_x_pos = 0; static char estimation_string[10]; #if ENABLED(DOGM_SD_PERCENT) && ENABLED(ROTATE_PROGRESS_DISPLAY) #define PROGRESS_TIME_PREFIX "PROG" #define ELAPSED_TIME_PREFIX "ELAP" #define SHOW_REMAINING_TIME_PREFIX "REM" - static uint8_t progress_x_pos = 0; + static u8g_uint_t progress_x_pos = 0; static uint8_t progress_state = 0; static bool prev_blink = 0; #else @@ -397,19 +397,26 @@ void MarlinUI::draw_status_screen() { ; duration_t elapsed = print_job_timer.duration(); const uint8_t p = progress & 0xFF, ev = elapsed.value & 0xFF; - if (progress > 1 && p != lastProgress) { + if (progress > 1 || p != lastProgress) { lastProgress = p; - progress_bar_solid_width = uint8_t((PROGRESS_BAR_WIDTH - 2) * progress / (PROGRESS_SCALE) * 0.01f); + progress_bar_solid_width = u8g_uint_t((PROGRESS_BAR_WIDTH - 2) * progress / (PROGRESS_SCALE) * 0.01f); #if ENABLED(DOGM_SD_PERCENT) - strcpy(progress_string, ( - #if ENABLED(PRINT_PROGRESS_SHOW_DECIMALS) - permyriadtostr4(progress) - #else - ui8tostr3(progress / (PROGRESS_SCALE)) - #endif - )); + if (progress == 0) { + progress_string[0] = '\0'; + estimation_string[0] = '\0'; + estimation_x_pos = _PROGRESS_CENTER_X(0); + } + else { + strcpy(progress_string, ( + #if ENABLED(PRINT_PROGRESS_SHOW_DECIMALS) + permyriadtostr4(progress) + #else + ui8tostr3(progress / (PROGRESS_SCALE)) + #endif + )); + } #if ENABLED(SHOW_REMAINING_TIME) && ENABLED(ROTATE_PROGRESS_DISPLAY) // Tristate progress display mode progress_x_pos = _SD_DURATION_X(strlen(progress_string)+1); #endif From 52a8bbefcf6ce6b5869c740c88662acd5292706b Mon Sep 17 00:00:00 2001 From: Robby Candra Date: Sun, 20 Oct 2019 23:44:05 +0700 Subject: [PATCH 06/13] Make sure estimate time = 0 not displayed --- Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp index 752413a68c..591d0f08ad 100644 --- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp +++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp @@ -432,13 +432,19 @@ void MarlinUI::draw_status_screen() { #if ENABLED(SHOW_REMAINING_TIME) if (!(ev & 0x3)) { duration_t estimation = elapsed.value * (100 * (PROGRESS_SCALE) - progress) / progress; - const bool has_days = (estimation.value >= 60*60*24L); - const uint8_t len = estimation.toDigital(estimation_string, has_days); - #if ENABLED(DOGM_SD_PERCENT) && ENABLED(ROTATE_PROGRESS_DISPLAY) - estimation_x_pos = _SD_DURATION_X(len); - #else - estimation_x_pos = _SD_DURATION_X(len + 1); - #endif + if (estimation.value == 0) { + estimation_string[0] = '\0'; + estimation_x_pos = _PROGRESS_CENTER_X(0); + } + else { + const bool has_days = (estimation.value >= 60*60*24L); + const uint8_t len = estimation.toDigital(estimation_string, has_days); + #if ENABLED(DOGM_SD_PERCENT) && ENABLED(ROTATE_PROGRESS_DISPLAY) + estimation_x_pos = _SD_DURATION_X(len); + #else + estimation_x_pos = _SD_DURATION_X(len + 1); + #endif + } } #endif } From d64ab63026bee982b43d4ebbb821f44b92f391f2 Mon Sep 17 00:00:00 2001 From: Robby Candra Date: Tue, 22 Oct 2019 08:16:29 +0700 Subject: [PATCH 07/13] Fix Estimation String Macro --- Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp index 591d0f08ad..8ea5e9cf29 100644 --- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp +++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp @@ -405,8 +405,10 @@ void MarlinUI::draw_status_screen() { #if ENABLED(DOGM_SD_PERCENT) if (progress == 0) { progress_string[0] = '\0'; - estimation_string[0] = '\0'; - estimation_x_pos = _PROGRESS_CENTER_X(0); + #if ENABLED(SHOW_REMAINING_TIME) + estimation_string[0] = '\0'; + estimation_x_pos = _SD_DURATION_X(0); + #endif } else { strcpy(progress_string, ( From 2c4252676336965db2c4837c476d25766fc4d4a5 Mon Sep 17 00:00:00 2001 From: Robby Candra Date: Tue, 22 Oct 2019 10:01:58 +0700 Subject: [PATCH 08/13] FIx Estimation String Pos --- Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp index 8ea5e9cf29..a18b383a89 100644 --- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp +++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp @@ -436,7 +436,7 @@ void MarlinUI::draw_status_screen() { duration_t estimation = elapsed.value * (100 * (PROGRESS_SCALE) - progress) / progress; if (estimation.value == 0) { estimation_string[0] = '\0'; - estimation_x_pos = _PROGRESS_CENTER_X(0); + estimation_x_pos = _SD_DURATION_X(0); } else { const bool has_days = (estimation.value >= 60*60*24L); From 5edd5d1e1f169ec9c41c36cfc85525bc2e2b1401 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 24 Oct 2019 13:38:39 -0500 Subject: [PATCH 09/13] Clean up --- Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 25 +++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp index a18b383a89..57add84923 100644 --- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp +++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp @@ -596,38 +596,38 @@ void MarlinUI::draw_status_screen() { if (PAGE_CONTAINS(EXTRAS_BASELINE - INFO_FONT_ASCENT, EXTRAS_BASELINE - 1)) { - #if ENABLED(DOGM_SD_PERCENT) && ENABLED(SHOW_REMAINING_TIME) && ENABLED(ROTATE_PROGRESS_DISPLAY) + #if ALL(DOGM_SD_PERCENT, SHOW_REMAINING_TIME, ROTATE_PROGRESS_DISPLAY) + if (prev_blink != blink) { prev_blink = blink; - progress_state++; - if (progress_state >=3) progress_state = 0; + if (++progress_state >= 3) progress_state = 0; } if (progress_state == 0) { - if (progress_string[0] != '\0') { + if (progress_string[0]) { lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, PROGRESS_TIME_PREFIX); lcd_put_u8str(progress_x_pos, EXTRAS_BASELINE, progress_string); lcd_put_wchar('%'); } } - else if (progress_state == 2 && estimation_string[0] != '\0') { + else if (progress_state == 2 && estimation_string[0]) { lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, SHOW_REMAINING_TIME_PREFIX); lcd_put_u8str(estimation_x_pos, EXTRAS_BASELINE, estimation_string); } - else if (elapsed_string[0] != '\0'){ + else if (elapsed_string[0]) { lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, ELAPSED_TIME_PREFIX); lcd_put_u8str(elapsed_x_pos, EXTRAS_BASELINE, elapsed_string); } - #else + + #else // !DOGM_SD_PERCENT || !SHOW_REMAINING_TIME || !ROTATE_PROGRESS_DISPLAY // // SD Percent Complete // #if ENABLED(DOGM_SD_PERCENT) - if (progress_string[0] != '\0') { - // Percent complete - lcd_put_u8str(55, 48, progress_string); + if (progress_string[0]) { + lcd_put_u8str(55, 48, progress_string); // Percent complete lcd_put_wchar('%'); } #endif @@ -637,7 +637,7 @@ void MarlinUI::draw_status_screen() { // #if ENABLED(SHOW_REMAINING_TIME) - if (blink && (estimation_string[0] != '\0')) { + if (blink && estimation_string[0]) { lcd_put_wchar(estimation_x_pos, EXTRAS_BASELINE, SHOW_REMAINING_TIME_PREFIX); lcd_put_u8str(estimation_string); } @@ -645,8 +645,9 @@ void MarlinUI::draw_status_screen() { #endif lcd_put_u8str(elapsed_x_pos, EXTRAS_BASELINE, elapsed_string); - #endif + #else // !DOGM_SD_PERCENT || !SHOW_REMAINING_TIME || !ROTATE_PROGRESS_DISPLAY } + #endif // HAS_PRINT_PROGRESS // From 326d5b84e7d17051f3d39033a067e540845f5197 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 24 Oct 2019 13:39:32 -0500 Subject: [PATCH 10/13] Update status_screen_DOGM.cpp --- Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp index 57add84923..2fa6f2fad7 100644 --- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp +++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp @@ -397,7 +397,7 @@ void MarlinUI::draw_status_screen() { ; duration_t elapsed = print_job_timer.duration(); const uint8_t p = progress & 0xFF, ev = elapsed.value & 0xFF; - if (progress > 1 || p != lastProgress) { + if (p != lastProgress) { lastProgress = p; progress_bar_solid_width = u8g_uint_t((PROGRESS_BAR_WIDTH - 2) * progress / (PROGRESS_SCALE) * 0.01f); From ff4301a422b081cee26e32e2ef0067ee5e834563 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 24 Oct 2019 13:42:02 -0500 Subject: [PATCH 11/13] Update status_screen_DOGM.cpp --- Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp index 2fa6f2fad7..f9a17280db 100644 --- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp +++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp @@ -349,7 +349,7 @@ void MarlinUI::draw_status_screen() { #if ENABLED(SHOW_REMAINING_TIME) static u8g_uint_t estimation_x_pos = 0; static char estimation_string[10]; - #if ENABLED(DOGM_SD_PERCENT) && ENABLED(ROTATE_PROGRESS_DISPLAY) + #if BOTH(DOGM_SD_PERCENT, ROTATE_PROGRESS_DISPLAY) #define PROGRESS_TIME_PREFIX "PROG" #define ELAPSED_TIME_PREFIX "ELAP" #define SHOW_REMAINING_TIME_PREFIX "REM" @@ -419,8 +419,8 @@ void MarlinUI::draw_status_screen() { #endif )); } - #if ENABLED(SHOW_REMAINING_TIME) && ENABLED(ROTATE_PROGRESS_DISPLAY) // Tristate progress display mode - progress_x_pos = _SD_DURATION_X(strlen(progress_string)+1); + #if BOTH(SHOW_REMAINING_TIME, ROTATE_PROGRESS_DISPLAY) // Tri-state progress display mode + progress_x_pos = _SD_DURATION_X(strlen(progress_string) + 1); #endif #endif } @@ -441,7 +441,7 @@ void MarlinUI::draw_status_screen() { else { const bool has_days = (estimation.value >= 60*60*24L); const uint8_t len = estimation.toDigital(estimation_string, has_days); - #if ENABLED(DOGM_SD_PERCENT) && ENABLED(ROTATE_PROGRESS_DISPLAY) + #if BOTH(DOGM_SD_PERCENT, ROTATE_PROGRESS_DISPLAY) estimation_x_pos = _SD_DURATION_X(len); #else estimation_x_pos = _SD_DURATION_X(len + 1); From ccf61eca844473f0dbe955f989282d2871fd927c Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 24 Oct 2019 13:48:27 -0500 Subject: [PATCH 12/13] Fix diplay elaspsed --- Marlin/Configuration_adv.h | 9 ++++----- config/default/Configuration_adv.h | 9 ++++----- config/examples/3DFabXYZ/Migbot/Configuration_adv.h | 9 ++++----- config/examples/ADIMLab/Gantry v1/Configuration_adv.h | 9 ++++----- config/examples/ADIMLab/Gantry v2/Configuration_adv.h | 9 ++++----- config/examples/AlephObjects/TAZ4/Configuration_adv.h | 9 ++++----- config/examples/Alfawise/U20-bltouch/Configuration_adv.h | 9 ++++----- config/examples/Alfawise/U20/Configuration_adv.h | 9 ++++----- config/examples/AliExpress/UM2pExt/Configuration_adv.h | 9 ++++----- config/examples/Anet/A2/Configuration_adv.h | 9 ++++----- config/examples/Anet/A2plus/Configuration_adv.h | 9 ++++----- config/examples/Anet/A6/Configuration_adv.h | 9 ++++----- config/examples/Anet/A8/Configuration_adv.h | 9 ++++----- config/examples/Anet/A8plus/Configuration_adv.h | 9 ++++----- config/examples/Anet/E16/Configuration_adv.h | 9 ++++----- config/examples/AnyCubic/i3/Configuration_adv.h | 9 ++++----- config/examples/ArmEd/Configuration_adv.h | 9 ++++----- config/examples/BIBO/TouchX/cyclops/Configuration_adv.h | 9 ++++----- config/examples/BIBO/TouchX/default/Configuration_adv.h | 9 ++++----- config/examples/BQ/Hephestos/Configuration_adv.h | 9 ++++----- config/examples/BQ/Hephestos_2/Configuration_adv.h | 9 ++++----- config/examples/BQ/WITBOX/Configuration_adv.h | 9 ++++----- config/examples/Cartesio/Configuration_adv.h | 9 ++++----- config/examples/Creality/CR-10/Configuration_adv.h | 9 ++++----- config/examples/Creality/CR-10S/Configuration_adv.h | 9 ++++----- config/examples/Creality/CR-10_5S/Configuration_adv.h | 9 ++++----- config/examples/Creality/CR-10mini/Configuration_adv.h | 9 ++++----- config/examples/Creality/CR-20 Pro/Configuration_adv.h | 9 ++++----- config/examples/Creality/CR-20/Configuration_adv.h | 9 ++++----- config/examples/Creality/CR-8/Configuration_adv.h | 9 ++++----- config/examples/Creality/Ender-2/Configuration_adv.h | 9 ++++----- config/examples/Creality/Ender-3/Configuration_adv.h | 9 ++++----- config/examples/Creality/Ender-4/Configuration_adv.h | 9 ++++----- config/examples/Creality/Ender-5/Configuration_adv.h | 9 ++++----- .../examples/Dagoma/Disco Ultimate/Configuration_adv.h | 9 ++++----- .../EVNOVO (Artillery)/Sidewinder X1/Configuration_adv.h | 9 ++++----- config/examples/Einstart-S/Configuration_adv.h | 9 ++++----- config/examples/FYSETC/AIO_II/Configuration_adv.h | 9 ++++----- .../FYSETC/Cheetah 1.2/BLTouch/Configuration_adv.h | 9 ++++----- .../examples/FYSETC/Cheetah 1.2/base/Configuration_adv.h | 9 ++++----- .../examples/FYSETC/Cheetah/BLTouch/Configuration_adv.h | 9 ++++----- config/examples/FYSETC/Cheetah/base/Configuration_adv.h | 9 ++++----- config/examples/FYSETC/F6_13/Configuration_adv.h | 9 ++++----- config/examples/Felix/DUAL/Configuration_adv.h | 9 ++++----- config/examples/Felix/Single/Configuration_adv.h | 9 ++++----- .../examples/FlashForge/CreatorPro/Configuration_adv.h | 9 ++++----- config/examples/FolgerTech/i3-2020/Configuration_adv.h | 9 ++++----- config/examples/Formbot/Raptor/Configuration_adv.h | 9 ++++----- config/examples/Formbot/T_Rex_3/Configuration_adv.h | 9 ++++----- config/examples/Geeetech/A10/Configuration_adv.h | 9 ++++----- config/examples/Geeetech/A10M/Configuration_adv.h | 9 ++++----- config/examples/Geeetech/A20M/Configuration_adv.h | 9 ++++----- config/examples/Geeetech/MeCreator2/Configuration_adv.h | 9 ++++----- .../examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h | 9 ++++----- .../examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h | 9 ++++----- config/examples/HMS434/Configuration_adv.h | 9 ++++----- config/examples/Infitary/i3-M508/Configuration_adv.h | 9 ++++----- config/examples/JGAurora/A1/Configuration_adv.h | 9 ++++----- config/examples/JGAurora/A5/Configuration_adv.h | 9 ++++----- config/examples/JGAurora/A5S/Configuration_adv.h | 9 ++++----- config/examples/MakerParts/Configuration_adv.h | 9 ++++----- config/examples/Malyan/M150/Configuration_adv.h | 9 ++++----- config/examples/Malyan/M200/Configuration_adv.h | 9 ++++----- .../examples/Micromake/C1/enhanced/Configuration_adv.h | 9 ++++----- config/examples/Mks/Robin/Configuration_adv.h | 9 ++++----- config/examples/Mks/Sbase/Configuration_adv.h | 9 ++++----- config/examples/RapideLite/RL200/Configuration_adv.h | 9 ++++----- config/examples/RigidBot/Configuration_adv.h | 9 ++++----- config/examples/SCARA/Configuration_adv.h | 9 ++++----- .../STM32/Black_STM32F407VET6/Configuration_adv.h | 9 ++++----- config/examples/Sanguinololu/Configuration_adv.h | 9 ++++----- config/examples/Tevo/Michelangelo/Configuration_adv.h | 9 ++++----- config/examples/Tevo/Tarantula Pro/Configuration_adv.h | 9 ++++----- .../Tevo/Tornado/V1 (MKS Base)/Configuration_adv.h | 9 ++++----- .../Tevo/Tornado/V2 (MKS GEN-L)/Configuration_adv.h | 9 ++++----- config/examples/TheBorg/Configuration_adv.h | 9 ++++----- config/examples/TinyBoy2/Configuration_adv.h | 9 ++++----- config/examples/Tronxy/X3A/Configuration_adv.h | 9 ++++----- config/examples/Tronxy/X5S-2E/Configuration_adv.h | 9 ++++----- config/examples/UltiMachine/Archim1/Configuration_adv.h | 9 ++++----- config/examples/UltiMachine/Archim2/Configuration_adv.h | 9 ++++----- config/examples/VORONDesign/Configuration_adv.h | 9 ++++----- config/examples/Velleman/K8200/Configuration_adv.h | 9 ++++----- .../Velleman/K8400/Dual-head/Configuration_adv.h | 9 ++++----- .../Velleman/K8400/Single-head/Configuration_adv.h | 9 ++++----- config/examples/WASP/PowerWASP/Configuration_adv.h | 9 ++++----- config/examples/Wanhao/Duplicator 6/Configuration_adv.h | 9 ++++----- .../Wanhao/Duplicator i3 Mini/Configuration_adv.h | 9 ++++----- .../examples/delta/Anycubic/Kossel/Configuration_adv.h | 9 ++++----- .../delta/Dreammaker/Overlord/Configuration_adv.h | 9 ++++----- .../delta/Dreammaker/Overlord_Pro/Configuration_adv.h | 9 ++++----- .../delta/FLSUN/auto_calibrate/Configuration_adv.h | 9 ++++----- config/examples/delta/FLSUN/kossel/Configuration_adv.h | 9 ++++----- .../examples/delta/FLSUN/kossel_mini/Configuration_adv.h | 9 ++++----- .../delta/Geeetech/Rostock 301/Configuration_adv.h | 9 ++++----- config/examples/delta/MKS/SBASE/Configuration_adv.h | 9 ++++----- .../delta/Tevo Little Monster/Configuration_adv.h | 9 ++++----- config/examples/delta/generic/Configuration_adv.h | 9 ++++----- config/examples/delta/kossel_mini/Configuration_adv.h | 9 ++++----- config/examples/delta/kossel_xl/Configuration_adv.h | 9 ++++----- config/examples/gCreate/gMax1.5+/Configuration_adv.h | 9 ++++----- config/examples/makibox/Configuration_adv.h | 9 ++++----- config/examples/tvrrug/Round2/Configuration_adv.h | 9 ++++----- config/examples/wt150/Configuration_adv.h | 9 ++++----- 104 files changed, 416 insertions(+), 520 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 5ccf208471..99d94898fd 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/default/Configuration_adv.h b/config/default/Configuration_adv.h index c0b776987b..99d94898fd 100644 --- a/config/default/Configuration_adv.h +++ b/config/default/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/3DFabXYZ/Migbot/Configuration_adv.h b/config/examples/3DFabXYZ/Migbot/Configuration_adv.h index a57a76d2b6..c93ada2ea2 100644 --- a/config/examples/3DFabXYZ/Migbot/Configuration_adv.h +++ b/config/examples/3DFabXYZ/Migbot/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/ADIMLab/Gantry v1/Configuration_adv.h b/config/examples/ADIMLab/Gantry v1/Configuration_adv.h index 3ec41f364d..8b18e83a98 100644 --- a/config/examples/ADIMLab/Gantry v1/Configuration_adv.h +++ b/config/examples/ADIMLab/Gantry v1/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/ADIMLab/Gantry v2/Configuration_adv.h b/config/examples/ADIMLab/Gantry v2/Configuration_adv.h index 8441dee687..5213101dea 100644 --- a/config/examples/ADIMLab/Gantry v2/Configuration_adv.h +++ b/config/examples/ADIMLab/Gantry v2/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/AlephObjects/TAZ4/Configuration_adv.h b/config/examples/AlephObjects/TAZ4/Configuration_adv.h index 55bbd2098a..dba30946a4 100644 --- a/config/examples/AlephObjects/TAZ4/Configuration_adv.h +++ b/config/examples/AlephObjects/TAZ4/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Alfawise/U20-bltouch/Configuration_adv.h b/config/examples/Alfawise/U20-bltouch/Configuration_adv.h index ff44ea42dd..a557a31a03 100644 --- a/config/examples/Alfawise/U20-bltouch/Configuration_adv.h +++ b/config/examples/Alfawise/U20-bltouch/Configuration_adv.h @@ -890,11 +890,10 @@ // Add an 'M73' G-code to set the current percentage #define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Alfawise/U20/Configuration_adv.h b/config/examples/Alfawise/U20/Configuration_adv.h index 8c4419ab54..f44f016478 100644 --- a/config/examples/Alfawise/U20/Configuration_adv.h +++ b/config/examples/Alfawise/U20/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage #define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/AliExpress/UM2pExt/Configuration_adv.h b/config/examples/AliExpress/UM2pExt/Configuration_adv.h index 61891d65d6..da9d22b562 100644 --- a/config/examples/AliExpress/UM2pExt/Configuration_adv.h +++ b/config/examples/AliExpress/UM2pExt/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Anet/A2/Configuration_adv.h b/config/examples/Anet/A2/Configuration_adv.h index ceddb2b391..032c751cbc 100644 --- a/config/examples/Anet/A2/Configuration_adv.h +++ b/config/examples/Anet/A2/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Anet/A2plus/Configuration_adv.h b/config/examples/Anet/A2plus/Configuration_adv.h index ceddb2b391..032c751cbc 100644 --- a/config/examples/Anet/A2plus/Configuration_adv.h +++ b/config/examples/Anet/A2plus/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Anet/A6/Configuration_adv.h b/config/examples/Anet/A6/Configuration_adv.h index a8326ca930..d2992e336a 100644 --- a/config/examples/Anet/A6/Configuration_adv.h +++ b/config/examples/Anet/A6/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Anet/A8/Configuration_adv.h b/config/examples/Anet/A8/Configuration_adv.h index 84244ac61d..477ab29281 100644 --- a/config/examples/Anet/A8/Configuration_adv.h +++ b/config/examples/Anet/A8/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Anet/A8plus/Configuration_adv.h b/config/examples/Anet/A8plus/Configuration_adv.h index 121e998bbb..e5a841f1c0 100644 --- a/config/examples/Anet/A8plus/Configuration_adv.h +++ b/config/examples/Anet/A8plus/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Anet/E16/Configuration_adv.h b/config/examples/Anet/E16/Configuration_adv.h index 982423a738..5532636d0d 100644 --- a/config/examples/Anet/E16/Configuration_adv.h +++ b/config/examples/Anet/E16/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/AnyCubic/i3/Configuration_adv.h b/config/examples/AnyCubic/i3/Configuration_adv.h index 7853c0d302..24003ae657 100644 --- a/config/examples/AnyCubic/i3/Configuration_adv.h +++ b/config/examples/AnyCubic/i3/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/ArmEd/Configuration_adv.h b/config/examples/ArmEd/Configuration_adv.h index 43ecbd9d3b..edb27b4cf7 100644 --- a/config/examples/ArmEd/Configuration_adv.h +++ b/config/examples/ArmEd/Configuration_adv.h @@ -893,11 +893,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h b/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h index 704febe7ba..eb07d16edc 100644 --- a/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h +++ b/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/BIBO/TouchX/default/Configuration_adv.h b/config/examples/BIBO/TouchX/default/Configuration_adv.h index 6735d7c4c2..ac21e6edef 100644 --- a/config/examples/BIBO/TouchX/default/Configuration_adv.h +++ b/config/examples/BIBO/TouchX/default/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/BQ/Hephestos/Configuration_adv.h b/config/examples/BQ/Hephestos/Configuration_adv.h index 35877dcfee..b14be258ac 100644 --- a/config/examples/BQ/Hephestos/Configuration_adv.h +++ b/config/examples/BQ/Hephestos/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/BQ/Hephestos_2/Configuration_adv.h b/config/examples/BQ/Hephestos_2/Configuration_adv.h index 2890c00eaa..bd083bf40b 100644 --- a/config/examples/BQ/Hephestos_2/Configuration_adv.h +++ b/config/examples/BQ/Hephestos_2/Configuration_adv.h @@ -897,11 +897,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/BQ/WITBOX/Configuration_adv.h b/config/examples/BQ/WITBOX/Configuration_adv.h index 35877dcfee..b14be258ac 100644 --- a/config/examples/BQ/WITBOX/Configuration_adv.h +++ b/config/examples/BQ/WITBOX/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Cartesio/Configuration_adv.h b/config/examples/Cartesio/Configuration_adv.h index 08df970ac3..666b0c9dc1 100644 --- a/config/examples/Cartesio/Configuration_adv.h +++ b/config/examples/Cartesio/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Creality/CR-10/Configuration_adv.h b/config/examples/Creality/CR-10/Configuration_adv.h index 68eb7cc004..b7a782aa29 100644 --- a/config/examples/Creality/CR-10/Configuration_adv.h +++ b/config/examples/Creality/CR-10/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Creality/CR-10S/Configuration_adv.h b/config/examples/Creality/CR-10S/Configuration_adv.h index fe66bbb7e5..59a07a5d51 100644 --- a/config/examples/Creality/CR-10S/Configuration_adv.h +++ b/config/examples/Creality/CR-10S/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Creality/CR-10_5S/Configuration_adv.h b/config/examples/Creality/CR-10_5S/Configuration_adv.h index 393f1bfdba..4313421d56 100644 --- a/config/examples/Creality/CR-10_5S/Configuration_adv.h +++ b/config/examples/Creality/CR-10_5S/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Creality/CR-10mini/Configuration_adv.h b/config/examples/Creality/CR-10mini/Configuration_adv.h index 17c3b6d046..4ed767f420 100644 --- a/config/examples/Creality/CR-10mini/Configuration_adv.h +++ b/config/examples/Creality/CR-10mini/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Creality/CR-20 Pro/Configuration_adv.h b/config/examples/Creality/CR-20 Pro/Configuration_adv.h index 1897433613..8e0a7eb6a3 100644 --- a/config/examples/Creality/CR-20 Pro/Configuration_adv.h +++ b/config/examples/Creality/CR-20 Pro/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Creality/CR-20/Configuration_adv.h b/config/examples/Creality/CR-20/Configuration_adv.h index 55f468acac..25a002f203 100644 --- a/config/examples/Creality/CR-20/Configuration_adv.h +++ b/config/examples/Creality/CR-20/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Creality/CR-8/Configuration_adv.h b/config/examples/Creality/CR-8/Configuration_adv.h index 6ddcf54265..a8e21c0c1f 100644 --- a/config/examples/Creality/CR-8/Configuration_adv.h +++ b/config/examples/Creality/CR-8/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Creality/Ender-2/Configuration_adv.h b/config/examples/Creality/Ender-2/Configuration_adv.h index b751207f75..9e3d4fc5eb 100644 --- a/config/examples/Creality/Ender-2/Configuration_adv.h +++ b/config/examples/Creality/Ender-2/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Creality/Ender-3/Configuration_adv.h b/config/examples/Creality/Ender-3/Configuration_adv.h index 903d213213..206abc0322 100644 --- a/config/examples/Creality/Ender-3/Configuration_adv.h +++ b/config/examples/Creality/Ender-3/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Creality/Ender-4/Configuration_adv.h b/config/examples/Creality/Ender-4/Configuration_adv.h index bd2144ebc9..4896d93025 100644 --- a/config/examples/Creality/Ender-4/Configuration_adv.h +++ b/config/examples/Creality/Ender-4/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Creality/Ender-5/Configuration_adv.h b/config/examples/Creality/Ender-5/Configuration_adv.h index b541f2e9d2..8b2987f539 100644 --- a/config/examples/Creality/Ender-5/Configuration_adv.h +++ b/config/examples/Creality/Ender-5/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Dagoma/Disco Ultimate/Configuration_adv.h b/config/examples/Dagoma/Disco Ultimate/Configuration_adv.h index 440c9fa665..de45894221 100644 --- a/config/examples/Dagoma/Disco Ultimate/Configuration_adv.h +++ b/config/examples/Dagoma/Disco Ultimate/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage #define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/EVNOVO (Artillery)/Sidewinder X1/Configuration_adv.h b/config/examples/EVNOVO (Artillery)/Sidewinder X1/Configuration_adv.h index bc5a1eb763..26fdc7d0d1 100755 --- a/config/examples/EVNOVO (Artillery)/Sidewinder X1/Configuration_adv.h +++ b/config/examples/EVNOVO (Artillery)/Sidewinder X1/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Einstart-S/Configuration_adv.h b/config/examples/Einstart-S/Configuration_adv.h index 0a8d34ddc4..affbec6fe0 100644 --- a/config/examples/Einstart-S/Configuration_adv.h +++ b/config/examples/Einstart-S/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/FYSETC/AIO_II/Configuration_adv.h b/config/examples/FYSETC/AIO_II/Configuration_adv.h index 0c7fa4782d..ea7a9c797f 100644 --- a/config/examples/FYSETC/AIO_II/Configuration_adv.h +++ b/config/examples/FYSETC/AIO_II/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/FYSETC/Cheetah 1.2/BLTouch/Configuration_adv.h b/config/examples/FYSETC/Cheetah 1.2/BLTouch/Configuration_adv.h index 1878fcf897..63bedb9daf 100644 --- a/config/examples/FYSETC/Cheetah 1.2/BLTouch/Configuration_adv.h +++ b/config/examples/FYSETC/Cheetah 1.2/BLTouch/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/FYSETC/Cheetah 1.2/base/Configuration_adv.h b/config/examples/FYSETC/Cheetah 1.2/base/Configuration_adv.h index 1878fcf897..63bedb9daf 100644 --- a/config/examples/FYSETC/Cheetah 1.2/base/Configuration_adv.h +++ b/config/examples/FYSETC/Cheetah 1.2/base/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/FYSETC/Cheetah/BLTouch/Configuration_adv.h b/config/examples/FYSETC/Cheetah/BLTouch/Configuration_adv.h index 1878fcf897..63bedb9daf 100644 --- a/config/examples/FYSETC/Cheetah/BLTouch/Configuration_adv.h +++ b/config/examples/FYSETC/Cheetah/BLTouch/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/FYSETC/Cheetah/base/Configuration_adv.h b/config/examples/FYSETC/Cheetah/base/Configuration_adv.h index 1878fcf897..63bedb9daf 100644 --- a/config/examples/FYSETC/Cheetah/base/Configuration_adv.h +++ b/config/examples/FYSETC/Cheetah/base/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/FYSETC/F6_13/Configuration_adv.h b/config/examples/FYSETC/F6_13/Configuration_adv.h index 5e370b6504..cb7a7c96e6 100644 --- a/config/examples/FYSETC/F6_13/Configuration_adv.h +++ b/config/examples/FYSETC/F6_13/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Felix/DUAL/Configuration_adv.h b/config/examples/Felix/DUAL/Configuration_adv.h index 33891aadca..05e0db7475 100644 --- a/config/examples/Felix/DUAL/Configuration_adv.h +++ b/config/examples/Felix/DUAL/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Felix/Single/Configuration_adv.h b/config/examples/Felix/Single/Configuration_adv.h index 33891aadca..05e0db7475 100644 --- a/config/examples/Felix/Single/Configuration_adv.h +++ b/config/examples/Felix/Single/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/FlashForge/CreatorPro/Configuration_adv.h b/config/examples/FlashForge/CreatorPro/Configuration_adv.h index b3810046b4..d64dc6d41e 100644 --- a/config/examples/FlashForge/CreatorPro/Configuration_adv.h +++ b/config/examples/FlashForge/CreatorPro/Configuration_adv.h @@ -888,11 +888,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/FolgerTech/i3-2020/Configuration_adv.h b/config/examples/FolgerTech/i3-2020/Configuration_adv.h index 39b1299ed8..53861a1128 100644 --- a/config/examples/FolgerTech/i3-2020/Configuration_adv.h +++ b/config/examples/FolgerTech/i3-2020/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Formbot/Raptor/Configuration_adv.h b/config/examples/Formbot/Raptor/Configuration_adv.h index edcfe9e3b8..9b1248fbed 100644 --- a/config/examples/Formbot/Raptor/Configuration_adv.h +++ b/config/examples/Formbot/Raptor/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage #define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Formbot/T_Rex_3/Configuration_adv.h b/config/examples/Formbot/T_Rex_3/Configuration_adv.h index a323e19a8a..e5c53eb76b 100644 --- a/config/examples/Formbot/T_Rex_3/Configuration_adv.h +++ b/config/examples/Formbot/T_Rex_3/Configuration_adv.h @@ -893,11 +893,10 @@ // Add an 'M73' G-code to set the current percentage #define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Geeetech/A10/Configuration_adv.h b/config/examples/Geeetech/A10/Configuration_adv.h index deac5d11bf..07ce3cfd17 100644 --- a/config/examples/Geeetech/A10/Configuration_adv.h +++ b/config/examples/Geeetech/A10/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Geeetech/A10M/Configuration_adv.h b/config/examples/Geeetech/A10M/Configuration_adv.h index c5bcb002dd..87a0033c12 100644 --- a/config/examples/Geeetech/A10M/Configuration_adv.h +++ b/config/examples/Geeetech/A10M/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Geeetech/A20M/Configuration_adv.h b/config/examples/Geeetech/A20M/Configuration_adv.h index 00c90a81f1..aee8267635 100644 --- a/config/examples/Geeetech/A20M/Configuration_adv.h +++ b/config/examples/Geeetech/A20M/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Geeetech/MeCreator2/Configuration_adv.h b/config/examples/Geeetech/MeCreator2/Configuration_adv.h index 4e67c4fc3c..bedac38c12 100644 --- a/config/examples/Geeetech/MeCreator2/Configuration_adv.h +++ b/config/examples/Geeetech/MeCreator2/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h b/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h index deac5d11bf..07ce3cfd17 100644 --- a/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h +++ b/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h b/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h index deac5d11bf..07ce3cfd17 100644 --- a/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h +++ b/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/HMS434/Configuration_adv.h b/config/examples/HMS434/Configuration_adv.h index ac9e641dd0..cdeaba09bd 100644 --- a/config/examples/HMS434/Configuration_adv.h +++ b/config/examples/HMS434/Configuration_adv.h @@ -857,11 +857,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Infitary/i3-M508/Configuration_adv.h b/config/examples/Infitary/i3-M508/Configuration_adv.h index cbc4b16178..a826732aef 100644 --- a/config/examples/Infitary/i3-M508/Configuration_adv.h +++ b/config/examples/Infitary/i3-M508/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/JGAurora/A1/Configuration_adv.h b/config/examples/JGAurora/A1/Configuration_adv.h index c13006e201..1c720d7a69 100644 --- a/config/examples/JGAurora/A1/Configuration_adv.h +++ b/config/examples/JGAurora/A1/Configuration_adv.h @@ -894,11 +894,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/JGAurora/A5/Configuration_adv.h b/config/examples/JGAurora/A5/Configuration_adv.h index 149e77c618..349fded124 100644 --- a/config/examples/JGAurora/A5/Configuration_adv.h +++ b/config/examples/JGAurora/A5/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/JGAurora/A5S/Configuration_adv.h b/config/examples/JGAurora/A5S/Configuration_adv.h index c13006e201..1c720d7a69 100644 --- a/config/examples/JGAurora/A5S/Configuration_adv.h +++ b/config/examples/JGAurora/A5S/Configuration_adv.h @@ -894,11 +894,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/MakerParts/Configuration_adv.h b/config/examples/MakerParts/Configuration_adv.h index 8aafd146a4..7b1ebef6d5 100644 --- a/config/examples/MakerParts/Configuration_adv.h +++ b/config/examples/MakerParts/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Malyan/M150/Configuration_adv.h b/config/examples/Malyan/M150/Configuration_adv.h index dff29f18ee..8193f7faf0 100644 --- a/config/examples/Malyan/M150/Configuration_adv.h +++ b/config/examples/Malyan/M150/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Malyan/M200/Configuration_adv.h b/config/examples/Malyan/M200/Configuration_adv.h index e3f78e51f4..121c0aa5af 100644 --- a/config/examples/Malyan/M200/Configuration_adv.h +++ b/config/examples/Malyan/M200/Configuration_adv.h @@ -891,11 +891,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Micromake/C1/enhanced/Configuration_adv.h b/config/examples/Micromake/C1/enhanced/Configuration_adv.h index 4bd182488d..dc4b3c733b 100644 --- a/config/examples/Micromake/C1/enhanced/Configuration_adv.h +++ b/config/examples/Micromake/C1/enhanced/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Mks/Robin/Configuration_adv.h b/config/examples/Mks/Robin/Configuration_adv.h index a530db5a9e..2bc39154b4 100644 --- a/config/examples/Mks/Robin/Configuration_adv.h +++ b/config/examples/Mks/Robin/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Mks/Sbase/Configuration_adv.h b/config/examples/Mks/Sbase/Configuration_adv.h index 643d5b8871..7c23155c0f 100644 --- a/config/examples/Mks/Sbase/Configuration_adv.h +++ b/config/examples/Mks/Sbase/Configuration_adv.h @@ -890,11 +890,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/RapideLite/RL200/Configuration_adv.h b/config/examples/RapideLite/RL200/Configuration_adv.h index dc692dfb24..9164f90a19 100644 --- a/config/examples/RapideLite/RL200/Configuration_adv.h +++ b/config/examples/RapideLite/RL200/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/RigidBot/Configuration_adv.h b/config/examples/RigidBot/Configuration_adv.h index 69171cc267..715f92d6c3 100644 --- a/config/examples/RigidBot/Configuration_adv.h +++ b/config/examples/RigidBot/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/SCARA/Configuration_adv.h b/config/examples/SCARA/Configuration_adv.h index 23e257d45b..e4136ec654 100644 --- a/config/examples/SCARA/Configuration_adv.h +++ b/config/examples/SCARA/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/STM32/Black_STM32F407VET6/Configuration_adv.h b/config/examples/STM32/Black_STM32F407VET6/Configuration_adv.h index 332dcc6dd9..5e05c75bcf 100644 --- a/config/examples/STM32/Black_STM32F407VET6/Configuration_adv.h +++ b/config/examples/STM32/Black_STM32F407VET6/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Sanguinololu/Configuration_adv.h b/config/examples/Sanguinololu/Configuration_adv.h index cc03cebe53..a953d1dcc7 100644 --- a/config/examples/Sanguinololu/Configuration_adv.h +++ b/config/examples/Sanguinololu/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Tevo/Michelangelo/Configuration_adv.h b/config/examples/Tevo/Michelangelo/Configuration_adv.h index cc342b0f84..f39577c464 100644 --- a/config/examples/Tevo/Michelangelo/Configuration_adv.h +++ b/config/examples/Tevo/Michelangelo/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage #define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Tevo/Tarantula Pro/Configuration_adv.h b/config/examples/Tevo/Tarantula Pro/Configuration_adv.h index dea84faef6..8c0be5a85e 100755 --- a/config/examples/Tevo/Tarantula Pro/Configuration_adv.h +++ b/config/examples/Tevo/Tarantula Pro/Configuration_adv.h @@ -885,11 +885,10 @@ // Add an 'M73' G-code to set the current percentage #define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Tevo/Tornado/V1 (MKS Base)/Configuration_adv.h b/config/examples/Tevo/Tornado/V1 (MKS Base)/Configuration_adv.h index f2966e6fad..a35d2d11f6 100755 --- a/config/examples/Tevo/Tornado/V1 (MKS Base)/Configuration_adv.h +++ b/config/examples/Tevo/Tornado/V1 (MKS Base)/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage #define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Tevo/Tornado/V2 (MKS GEN-L)/Configuration_adv.h b/config/examples/Tevo/Tornado/V2 (MKS GEN-L)/Configuration_adv.h index f2966e6fad..a35d2d11f6 100755 --- a/config/examples/Tevo/Tornado/V2 (MKS GEN-L)/Configuration_adv.h +++ b/config/examples/Tevo/Tornado/V2 (MKS GEN-L)/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage #define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/TheBorg/Configuration_adv.h b/config/examples/TheBorg/Configuration_adv.h index bbb4892769..6303c13b74 100644 --- a/config/examples/TheBorg/Configuration_adv.h +++ b/config/examples/TheBorg/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/TinyBoy2/Configuration_adv.h b/config/examples/TinyBoy2/Configuration_adv.h index 1ea9e58a2c..baa0751888 100644 --- a/config/examples/TinyBoy2/Configuration_adv.h +++ b/config/examples/TinyBoy2/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Tronxy/X3A/Configuration_adv.h b/config/examples/Tronxy/X3A/Configuration_adv.h index e177f71aee..8d33671068 100644 --- a/config/examples/Tronxy/X3A/Configuration_adv.h +++ b/config/examples/Tronxy/X3A/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Tronxy/X5S-2E/Configuration_adv.h b/config/examples/Tronxy/X5S-2E/Configuration_adv.h index f10d493ef1..e28b5e0847 100644 --- a/config/examples/Tronxy/X5S-2E/Configuration_adv.h +++ b/config/examples/Tronxy/X5S-2E/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/UltiMachine/Archim1/Configuration_adv.h b/config/examples/UltiMachine/Archim1/Configuration_adv.h index f2b87306f3..1cc2a2ee32 100644 --- a/config/examples/UltiMachine/Archim1/Configuration_adv.h +++ b/config/examples/UltiMachine/Archim1/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/UltiMachine/Archim2/Configuration_adv.h b/config/examples/UltiMachine/Archim2/Configuration_adv.h index 2019f390e3..ca9df42f88 100644 --- a/config/examples/UltiMachine/Archim2/Configuration_adv.h +++ b/config/examples/UltiMachine/Archim2/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/VORONDesign/Configuration_adv.h b/config/examples/VORONDesign/Configuration_adv.h index 2ba5d4dda9..3b13e441a3 100644 --- a/config/examples/VORONDesign/Configuration_adv.h +++ b/config/examples/VORONDesign/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Velleman/K8200/Configuration_adv.h b/config/examples/Velleman/K8200/Configuration_adv.h index bf0320c971..b1afe04d08 100644 --- a/config/examples/Velleman/K8200/Configuration_adv.h +++ b/config/examples/Velleman/K8200/Configuration_adv.h @@ -902,11 +902,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Velleman/K8400/Dual-head/Configuration_adv.h b/config/examples/Velleman/K8400/Dual-head/Configuration_adv.h index c888c428fa..006859fc7d 100644 --- a/config/examples/Velleman/K8400/Dual-head/Configuration_adv.h +++ b/config/examples/Velleman/K8400/Dual-head/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Velleman/K8400/Single-head/Configuration_adv.h b/config/examples/Velleman/K8400/Single-head/Configuration_adv.h index c888c428fa..006859fc7d 100644 --- a/config/examples/Velleman/K8400/Single-head/Configuration_adv.h +++ b/config/examples/Velleman/K8400/Single-head/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/WASP/PowerWASP/Configuration_adv.h b/config/examples/WASP/PowerWASP/Configuration_adv.h index bf792a113f..15d3abd422 100644 --- a/config/examples/WASP/PowerWASP/Configuration_adv.h +++ b/config/examples/WASP/PowerWASP/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Wanhao/Duplicator 6/Configuration_adv.h b/config/examples/Wanhao/Duplicator 6/Configuration_adv.h index da9e688e97..23391ae748 100644 --- a/config/examples/Wanhao/Duplicator 6/Configuration_adv.h +++ b/config/examples/Wanhao/Duplicator 6/Configuration_adv.h @@ -891,11 +891,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/Wanhao/Duplicator i3 Mini/Configuration_adv.h b/config/examples/Wanhao/Duplicator i3 Mini/Configuration_adv.h index b27cae440a..2fa78ba0cd 100644 --- a/config/examples/Wanhao/Duplicator i3 Mini/Configuration_adv.h +++ b/config/examples/Wanhao/Duplicator i3 Mini/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage #define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/delta/Anycubic/Kossel/Configuration_adv.h b/config/examples/delta/Anycubic/Kossel/Configuration_adv.h index ac8bdfe226..ec2f0c3530 100644 --- a/config/examples/delta/Anycubic/Kossel/Configuration_adv.h +++ b/config/examples/delta/Anycubic/Kossel/Configuration_adv.h @@ -891,11 +891,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/delta/Dreammaker/Overlord/Configuration_adv.h b/config/examples/delta/Dreammaker/Overlord/Configuration_adv.h index f856c4fc32..a7271b1227 100644 --- a/config/examples/delta/Dreammaker/Overlord/Configuration_adv.h +++ b/config/examples/delta/Dreammaker/Overlord/Configuration_adv.h @@ -891,11 +891,10 @@ // Add an 'M73' G-code to set the current percentage #define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/delta/Dreammaker/Overlord_Pro/Configuration_adv.h b/config/examples/delta/Dreammaker/Overlord_Pro/Configuration_adv.h index f856c4fc32..a7271b1227 100644 --- a/config/examples/delta/Dreammaker/Overlord_Pro/Configuration_adv.h +++ b/config/examples/delta/Dreammaker/Overlord_Pro/Configuration_adv.h @@ -891,11 +891,10 @@ // Add an 'M73' G-code to set the current percentage #define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h b/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h index 7d5b0e13ca..213f9be260 100644 --- a/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h +++ b/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h @@ -891,11 +891,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/delta/FLSUN/kossel/Configuration_adv.h b/config/examples/delta/FLSUN/kossel/Configuration_adv.h index 7d5b0e13ca..213f9be260 100644 --- a/config/examples/delta/FLSUN/kossel/Configuration_adv.h +++ b/config/examples/delta/FLSUN/kossel/Configuration_adv.h @@ -891,11 +891,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h b/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h index fc2a329ae7..d0c5da40ea 100644 --- a/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h +++ b/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h @@ -891,11 +891,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h b/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h index 45e05f58ef..b18bd8a002 100644 --- a/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h +++ b/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h @@ -891,11 +891,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/delta/MKS/SBASE/Configuration_adv.h b/config/examples/delta/MKS/SBASE/Configuration_adv.h index 45a336cf81..81586f0e18 100644 --- a/config/examples/delta/MKS/SBASE/Configuration_adv.h +++ b/config/examples/delta/MKS/SBASE/Configuration_adv.h @@ -891,11 +891,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/delta/Tevo Little Monster/Configuration_adv.h b/config/examples/delta/Tevo Little Monster/Configuration_adv.h index f2c6729846..eccfedfd7d 100644 --- a/config/examples/delta/Tevo Little Monster/Configuration_adv.h +++ b/config/examples/delta/Tevo Little Monster/Configuration_adv.h @@ -891,11 +891,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/delta/generic/Configuration_adv.h b/config/examples/delta/generic/Configuration_adv.h index fc2a329ae7..d0c5da40ea 100644 --- a/config/examples/delta/generic/Configuration_adv.h +++ b/config/examples/delta/generic/Configuration_adv.h @@ -891,11 +891,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/delta/kossel_mini/Configuration_adv.h b/config/examples/delta/kossel_mini/Configuration_adv.h index fc2a329ae7..d0c5da40ea 100644 --- a/config/examples/delta/kossel_mini/Configuration_adv.h +++ b/config/examples/delta/kossel_mini/Configuration_adv.h @@ -891,11 +891,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/delta/kossel_xl/Configuration_adv.h b/config/examples/delta/kossel_xl/Configuration_adv.h index 09ac1b71df..8001c38289 100644 --- a/config/examples/delta/kossel_xl/Configuration_adv.h +++ b/config/examples/delta/kossel_xl/Configuration_adv.h @@ -891,11 +891,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/gCreate/gMax1.5+/Configuration_adv.h b/config/examples/gCreate/gMax1.5+/Configuration_adv.h index 54f13ab798..452ca7879f 100644 --- a/config/examples/gCreate/gMax1.5+/Configuration_adv.h +++ b/config/examples/gCreate/gMax1.5+/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/makibox/Configuration_adv.h b/config/examples/makibox/Configuration_adv.h index 07e840e61f..b1e146fcc6 100644 --- a/config/examples/makibox/Configuration_adv.h +++ b/config/examples/makibox/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/tvrrug/Round2/Configuration_adv.h b/config/examples/tvrrug/Round2/Configuration_adv.h index db31cb3d0a..a9d444a712 100644 --- a/config/examples/tvrrug/Round2/Configuration_adv.h +++ b/config/examples/tvrrug/Round2/Configuration_adv.h @@ -889,11 +889,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS diff --git a/config/examples/wt150/Configuration_adv.h b/config/examples/wt150/Configuration_adv.h index cae60d5b33..244dc894af 100644 --- a/config/examples/wt150/Configuration_adv.h +++ b/config/examples/wt150/Configuration_adv.h @@ -890,11 +890,10 @@ // Add an 'M73' G-code to set the current percentage //#define LCD_SET_PROGRESS_MANUALLY -#if HAS_PRINT_PROGRESS - //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits (Graphical LCD only) - //#define SHOW_REMAINING_TIME // Display estimated time to completion (Graphical LCD only) - //#define ROTATE_PROGRESS_DISPLAY // if DOGM_SD_PERCENT enabled and SHOW_REMAINING_TIME enabled, - // rotate diplay for (P)rogress, (E)laspsed and (R)emaining Time. +#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS + //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits + //#define SHOW_REMAINING_TIME // Display estimated time to completion + //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS From 464d98d1788d9e02fdfbb0f917b0e9959266f235 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 24 Oct 2019 14:00:32 -0500 Subject: [PATCH 13/13] Short time prefixes, no percent prefix --- Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 28 +++++++++------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp index f9a17280db..9dcd3319fb 100644 --- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp +++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp @@ -335,9 +335,9 @@ void MarlinUI::draw_status_screen() { #if HAS_PRINT_PROGRESS #if DISABLED(DOGM_SD_PERCENT) - #define _SD_DURATION_X(len) (PROGRESS_BAR_X + (PROGRESS_BAR_WIDTH) / 2 - (len) * (MENU_FONT_WIDTH) / 2) + #define _SD_INFO_X(len) (PROGRESS_BAR_X + (PROGRESS_BAR_WIDTH) / 2 - (len) * (MENU_FONT_WIDTH) / 2) #else - #define _SD_DURATION_X(len) (LCD_PIXEL_WIDTH - (len) * (MENU_FONT_WIDTH)) + #define _SD_INFO_X(len) (LCD_PIXEL_WIDTH - (len) * (MENU_FONT_WIDTH)) #endif #if ENABLED(DOGM_SD_PERCENT) @@ -350,14 +350,9 @@ void MarlinUI::draw_status_screen() { static u8g_uint_t estimation_x_pos = 0; static char estimation_string[10]; #if BOTH(DOGM_SD_PERCENT, ROTATE_PROGRESS_DISPLAY) - #define PROGRESS_TIME_PREFIX "PROG" - #define ELAPSED_TIME_PREFIX "ELAP" - #define SHOW_REMAINING_TIME_PREFIX "REM" static u8g_uint_t progress_x_pos = 0; static uint8_t progress_state = 0; static bool prev_blink = 0; - #else - #define SHOW_REMAINING_TIME_PREFIX 'R' #endif #endif #endif @@ -407,7 +402,7 @@ void MarlinUI::draw_status_screen() { progress_string[0] = '\0'; #if ENABLED(SHOW_REMAINING_TIME) estimation_string[0] = '\0'; - estimation_x_pos = _SD_DURATION_X(0); + estimation_x_pos = _SD_INFO_X(0); #endif } else { @@ -420,7 +415,7 @@ void MarlinUI::draw_status_screen() { )); } #if BOTH(SHOW_REMAINING_TIME, ROTATE_PROGRESS_DISPLAY) // Tri-state progress display mode - progress_x_pos = _SD_DURATION_X(strlen(progress_string) + 1); + progress_x_pos = _SD_INFO_X(strlen(progress_string)); #endif #endif } @@ -429,22 +424,22 @@ void MarlinUI::draw_status_screen() { lastElapsed = ev; const bool has_days = (elapsed.value >= 60*60*24L); const uint8_t len = elapsed.toDigital(elapsed_string, has_days); - elapsed_x_pos = _SD_DURATION_X(len); + elapsed_x_pos = _SD_INFO_X(len); #if ENABLED(SHOW_REMAINING_TIME) if (!(ev & 0x3)) { duration_t estimation = elapsed.value * (100 * (PROGRESS_SCALE) - progress) / progress; if (estimation.value == 0) { estimation_string[0] = '\0'; - estimation_x_pos = _SD_DURATION_X(0); + estimation_x_pos = _SD_INFO_X(0); } else { const bool has_days = (estimation.value >= 60*60*24L); const uint8_t len = estimation.toDigital(estimation_string, has_days); #if BOTH(DOGM_SD_PERCENT, ROTATE_PROGRESS_DISPLAY) - estimation_x_pos = _SD_DURATION_X(len); + estimation_x_pos = _SD_INFO_X(len); #else - estimation_x_pos = _SD_DURATION_X(len + 1); + estimation_x_pos = _SD_INFO_X(len + 1); #endif } } @@ -605,17 +600,16 @@ void MarlinUI::draw_status_screen() { if (progress_state == 0) { if (progress_string[0]) { - lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, PROGRESS_TIME_PREFIX); lcd_put_u8str(progress_x_pos, EXTRAS_BASELINE, progress_string); lcd_put_wchar('%'); } } else if (progress_state == 2 && estimation_string[0]) { - lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, SHOW_REMAINING_TIME_PREFIX); + lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, "R:"); lcd_put_u8str(estimation_x_pos, EXTRAS_BASELINE, estimation_string); } else if (elapsed_string[0]) { - lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, ELAPSED_TIME_PREFIX); + lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, "E:"); lcd_put_u8str(elapsed_x_pos, EXTRAS_BASELINE, elapsed_string); } @@ -638,7 +632,7 @@ void MarlinUI::draw_status_screen() { #if ENABLED(SHOW_REMAINING_TIME) if (blink && estimation_string[0]) { - lcd_put_wchar(estimation_x_pos, EXTRAS_BASELINE, SHOW_REMAINING_TIME_PREFIX); + lcd_put_wchar(estimation_x_pos, EXTRAS_BASELINE, 'R'); lcd_put_u8str(estimation_string); } else