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 | 87 ++++++++++++++++------ 1 file changed, 63 insertions(+), 24 deletions(-) diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp index e5ff03413..ce6630efd 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 (PAGE_CONTAINS(EXTRAS_BASELINE - INFO_FONT_ASCENT, EXTRAS_BASELINE - 1)) { - #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('%'); + #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; } - #endif - // - // Elapsed Time - // + 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 - if (PAGE_CONTAINS(EXTRAS_BASELINE - INFO_FONT_ASCENT, EXTRAS_BASELINE - 1)) { + // + // 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); - #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); - } - else #endif - lcd_put_u8str(elapsed_x_pos, EXTRAS_BASELINE, elapsed_string); } - #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 ce6630efd..003da5960 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 be8cc5781..821517130 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 003da5960..a6ffe2f3c 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 821517130..5ccf20847 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 be8cc5781..c0b776987 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 9c6f19e5e..a57a76d2b 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 76eaee3bb..3ec41f364 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 c7c46e926..8441dee68 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 48649c6c8..55bbd2098 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 30b495a7d..ff44ea42d 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 fdf956ca3..8c4419ab5 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 cb042e01f..61891d65d 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 cb564592e..ceddb2b39 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 cb564592e..ceddb2b39 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 32c24672e..a8326ca93 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 e18a43a9a..84244ac61 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 313226f58..121e998bb 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 e9360c908..982423a73 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 166e56341..7853c0d30 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 752c3e14c..43ecbd9d3 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 f6bea9d21..704febe7b 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 0fea3b9d4..6735d7c4c 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 378f838fe..35877dcfe 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 846fa6d6e..2890c00ea 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 378f838fe..35877dcfe 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 a2ead624f..08df970ac 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 c8d88708a..68eb7cc00 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 a8c44a309..fe66bbb7e 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 4db8c109e..393f1bfdb 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 890da094d..17c3b6d04 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 d5b9e7496..189743361 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 fd8bc17b4..55f468aca 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 781f66066..6ddcf5426 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 91155e7fc..b751207f7 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 204d2c252..903d21321 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 002864dfd..bd2144ebc 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 378b9dbe6..b541f2e9d 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 56ed4b2a8..440c9fa66 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 ecc8950f6..bc5a1eb76 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 ecc262900..0a8d34ddc 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 d52e7eabf..0c7fa4782 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 cfdc43578..1878fcf89 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 cfdc43578..1878fcf89 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 cfdc43578..1878fcf89 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 cfdc43578..1878fcf89 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 7dafbc86f..5e370b650 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 9691273bf..33891aadc 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 9691273bf..33891aadc 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 3a986a213..b3810046b 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 3a2d81758..39b1299ed 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 b37f3d0de..edcfe9e3b 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 e51fee2c3..a323e19a8 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 a502b63cd..deac5d11b 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 b2f2ea41b..c5bcb002d 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 285ed5d9a..00c90a81f 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 95ae32e81..4e67c4fc3 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 a502b63cd..deac5d11b 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 a502b63cd..deac5d11b 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 0ab6fe34f..ac9e641dd 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 e0371b73f..cbc4b1617 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 8904cc60c..c13006e20 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 5a999ae81..149e77c61 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 8904cc60c..c13006e20 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 01d0dcd1e..8aafd146a 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 0b63942a7..dff29f18e 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 d74cef386..e3f78e51f 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 afc78f5af..4bd182488 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 7ec443495..a530db5a9 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 2b9459adf..643d5b887 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 e9c7c90c0..dc692dfb2 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 a7bc7a0f3..69171cc26 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 06a442a1c..23e257d45 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 73e0cdebd..332dcc6dd 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 76dffa229..cc03cebe5 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 9c543274c..cc342b0f8 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 6f1c5359b..dea84faef 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 ff8f516b7..f2966e6fa 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 ff8f516b7..f2966e6fa 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 6507e02c4..bbb489276 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 30f8b946a..1ea9e58a2 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 fccd1ce20..e177f71ae 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 5bb73f501..f10d493ef 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 008894701..f2b87306f 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 7ea2ed4c9..2019f390e 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 a43aa837b..2ba5d4dda 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 5470bfa0b..bf0320c97 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 6cef04b95..c888c428f 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 6cef04b95..c888c428f 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 f34f25f07..bf792a113 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 5bd3a5ed0..da9e688e9 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 b2d570529..b27cae440 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 7933fbca8..ac8bdfe22 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 a557f8036..f856c4fc3 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 a557f8036..f856c4fc3 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 05e35a636..7d5b0e13c 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 05e35a636..7d5b0e13c 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 2b6999715..fc2a329ae 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 696a96194..45e05f58e 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 b9f6b65a9..45a336cf8 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 8c36e633d..f2c672984 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 2b6999715..fc2a329ae 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 2b6999715..fc2a329ae 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 160d4b129..09ac1b71d 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 e8a4d0280..54f13ab79 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 655e9e769..07e840e61 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 ccfc0da92..db31cb3d0 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 f5936e6ca..cae60d5b3 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 a6ffe2f3c..752413a68 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 752413a68..591d0f08a 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 591d0f08a..8ea5e9cf2 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 8ea5e9cf2..a18b383a8 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 a18b383a8..57add8492 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 57add8492..2fa6f2fad 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 2fa6f2fad..f9a17280d 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 5ccf20847..99d94898f 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 c0b776987..99d94898f 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 a57a76d2b..c93ada2ea 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 3ec41f364..8b18e83a9 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 8441dee68..5213101de 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 55bbd2098..dba30946a 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 ff44ea42d..a557a31a0 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 8c4419ab5..f44f01647 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 61891d65d..da9d22b56 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 ceddb2b39..032c751cb 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 ceddb2b39..032c751cb 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 a8326ca93..d2992e336 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 84244ac61..477ab2928 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 121e998bb..e5a841f1c 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 982423a73..5532636d0 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 7853c0d30..24003ae65 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 43ecbd9d3..edb27b4cf 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 704febe7b..eb07d16ed 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 6735d7c4c..ac21e6ede 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 35877dcfe..b14be258a 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 2890c00ea..bd083bf40 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 35877dcfe..b14be258a 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 08df970ac..666b0c9dc 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 68eb7cc00..b7a782aa2 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 fe66bbb7e..59a07a5d5 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 393f1bfdb..4313421d5 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 17c3b6d04..4ed767f42 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 189743361..8e0a7eb6a 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 55f468aca..25a002f20 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 6ddcf5426..a8e21c0c1 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 b751207f7..9e3d4fc5e 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 903d21321..206abc032 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 bd2144ebc..4896d9302 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 b541f2e9d..8b2987f53 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 440c9fa66..de4589422 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 bc5a1eb76..26fdc7d0d 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 0a8d34ddc..affbec6fe 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 0c7fa4782..ea7a9c797 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 1878fcf89..63bedb9da 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 1878fcf89..63bedb9da 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 1878fcf89..63bedb9da 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 1878fcf89..63bedb9da 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 5e370b650..cb7a7c96e 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 33891aadc..05e0db747 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 33891aadc..05e0db747 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 b3810046b..d64dc6d41 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 39b1299ed..53861a112 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 edcfe9e3b..9b1248fbe 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 a323e19a8..e5c53eb76 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 deac5d11b..07ce3cfd1 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 c5bcb002d..87a0033c1 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 00c90a81f..aee826763 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 4e67c4fc3..bedac38c1 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 deac5d11b..07ce3cfd1 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 deac5d11b..07ce3cfd1 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 ac9e641dd..cdeaba09b 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 cbc4b1617..a826732ae 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 c13006e20..1c720d7a6 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 149e77c61..349fded12 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 c13006e20..1c720d7a6 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 8aafd146a..7b1ebef6d 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 dff29f18e..8193f7faf 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 e3f78e51f..121c0aa5a 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 4bd182488..dc4b3c733 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 a530db5a9..2bc39154b 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 643d5b887..7c23155c0 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 dc692dfb2..9164f90a1 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 69171cc26..715f92d6c 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 23e257d45..e4136ec65 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 332dcc6dd..5e05c75bc 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 cc03cebe5..a953d1dcc 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 cc342b0f8..f39577c46 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 dea84faef..8c0be5a85 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 f2966e6fa..a35d2d11f 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 f2966e6fa..a35d2d11f 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 bbb489276..6303c13b7 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 1ea9e58a2..baa075188 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 e177f71ae..8d3367106 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 f10d493ef..e28b5e084 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 f2b87306f..1cc2a2ee3 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 2019f390e..ca9df42f8 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 2ba5d4dda..3b13e441a 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 bf0320c97..b1afe04d0 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 c888c428f..006859fc7 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 c888c428f..006859fc7 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 bf792a113..15d3abd42 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 da9e688e9..23391ae74 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 b27cae440..2fa78ba0c 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 ac8bdfe22..ec2f0c353 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 f856c4fc3..a7271b122 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 f856c4fc3..a7271b122 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 7d5b0e13c..213f9be26 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 7d5b0e13c..213f9be26 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 fc2a329ae..d0c5da40e 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 45e05f58e..b18bd8a00 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 45a336cf8..81586f0e1 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 f2c672984..eccfedfd7 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 fc2a329ae..d0c5da40e 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 fc2a329ae..d0c5da40e 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 09ac1b71d..8001c3828 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 54f13ab79..452ca7879 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 07e840e61..b1e146fcc 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 db31cb3d0..a9d444a71 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 cae60d5b3..244dc894a 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 f9a17280d..9dcd3319f 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