From 168af8bacb0d2dae170f405e6da500cebac20753 Mon Sep 17 00:00:00 2001 From: blye Date: Thu, 25 Jan 2018 08:10:47 +0000 Subject: [PATCH 1/3] Allow LCD_SET_PROGRESS_MANUALLY without SDSUPPORT --- Marlin/src/lcd/ultralcd_impl_DOGM.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Marlin/src/lcd/ultralcd_impl_DOGM.h b/Marlin/src/lcd/ultralcd_impl_DOGM.h index 4e7b1e758..92dec8418 100644 --- a/Marlin/src/lcd/ultralcd_impl_DOGM.h +++ b/Marlin/src/lcd/ultralcd_impl_DOGM.h @@ -580,11 +580,9 @@ static void lcd_implementation_status_screen() { } #if ENABLED(SDSUPPORT) - // // SD Card Symbol // - if (card.isFileOpen() && PAGE_CONTAINS(42 - (TALL_FONT_CORRECTION), 51 - (TALL_FONT_CORRECTION))) { // Upper box u8g.drawBox(42, 42 - (TALL_FONT_CORRECTION), 8, 7); // 42-48 (or 41-47) @@ -595,11 +593,12 @@ static void lcd_implementation_status_screen() { // Corner pixel u8g.drawPixel(50, 43 - (TALL_FONT_CORRECTION)); // 43 (or 42) } + #endif // SDSUPPORT + #if ENABLED(SDSUPPORT) || ENABLED(LCD_SET_PROGRESS_MANUALLY) // // Progress bar frame // - #define PROGRESS_BAR_X 54 #define PROGRESS_BAR_WIDTH (LCD_PIXEL_WIDTH - PROGRESS_BAR_X) @@ -650,7 +649,6 @@ static void lcd_implementation_status_screen() { #endif if (PAGE_CONTAINS(41, 48)) { - char buffer[10]; duration_t elapsed = print_job_timer.duration(); bool has_days = (elapsed.value >= 60*60*24L); @@ -659,7 +657,7 @@ static void lcd_implementation_status_screen() { lcd_print(buffer); } - #endif + #endif // SDSUPPORT || LCD_SET_PROGRESS_MANUALLY // // XYZ Coordinates From 330437ad7c7e750c19619af01059748139940284 Mon Sep 17 00:00:00 2001 From: blye Date: Thu, 25 Jan 2018 08:33:32 +0000 Subject: [PATCH 2/3] Update LCD_SET_PROGRESS_MANUALLY in configs --- Marlin/Configuration_adv.h | 6 +++--- Marlin/src/config/default/Configuration_adv.h | 6 +++--- .../config/examples/AlephObjects/TAZ4/Configuration_adv.h | 6 +++--- Marlin/src/config/examples/Anet/A6/Configuration_adv.h | 6 +++--- Marlin/src/config/examples/Anet/A8/Configuration_adv.h | 6 +++--- Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h | 6 +++--- Marlin/src/config/examples/BIBO/TouchX/Configuration_adv.h | 6 +++--- Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h | 6 +++--- .../src/config/examples/BQ/Hephestos_2/Configuration_adv.h | 6 +++--- Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h | 6 +++--- Marlin/src/config/examples/Cartesio/Configuration_adv.h | 6 +++--- .../src/config/examples/Creality/CR-10/Configuration_adv.h | 6 +++--- .../src/config/examples/Creality/CR-10S/Configuration_adv.h | 6 +++--- .../src/config/examples/Creality/Ender/Configuration_adv.h | 6 +++--- Marlin/src/config/examples/Felix/Configuration_adv.h | 6 +++--- .../config/examples/FolgerTech/i3-2020/Configuration_adv.h | 6 +++--- .../config/examples/Infitary/i3-M508/Configuration_adv.h | 6 +++--- Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h | 6 +++--- Marlin/src/config/examples/MakerParts/Configuration_adv.h | 6 +++--- Marlin/src/config/examples/Malyan/M150/Configuration_adv.h | 6 +++--- Marlin/src/config/examples/Malyan/M200/Configuration_adv.h | 6 +++--- .../examples/Micromake/C1/enhanced/Configuration_adv.h | 6 +++--- Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h | 6 +++--- Marlin/src/config/examples/RigidBot/Configuration_adv.h | 6 +++--- Marlin/src/config/examples/SCARA/Configuration_adv.h | 6 +++--- Marlin/src/config/examples/Sanguinololu/Configuration_adv.h | 6 +++--- Marlin/src/config/examples/TheBorg/Configuration_adv.h | 6 +++--- Marlin/src/config/examples/TinyBoy2/Configuration_adv.h | 6 +++--- .../config/examples/UltiMachine/Archim2/Configuration_adv.h | 6 +++--- .../src/config/examples/Velleman/K8200/Configuration_adv.h | 6 +++--- .../src/config/examples/Velleman/K8400/Configuration_adv.h | 6 +++--- .../config/examples/Wanhao/Duplicator 6/Configuration_adv.h | 6 +++--- .../examples/delta/FLSUN/auto_calibrate/Configuration_adv.h | 6 +++--- .../config/examples/delta/FLSUN/kossel/Configuration_adv.h | 6 +++--- .../examples/delta/FLSUN/kossel_mini/Configuration_adv.h | 6 +++--- .../src/config/examples/delta/generic/Configuration_adv.h | 6 +++--- .../config/examples/delta/kossel_mini/Configuration_adv.h | 6 +++--- .../config/examples/delta/kossel_pro/Configuration_adv.h | 6 +++--- .../src/config/examples/delta/kossel_xl/Configuration_adv.h | 6 +++--- .../config/examples/gCreate/gMax1.5+/Configuration_adv.h | 6 +++--- Marlin/src/config/examples/makibox/Configuration_adv.h | 6 +++--- .../src/config/examples/tvrrug/Round2/Configuration_adv.h | 6 +++--- Marlin/src/config/examples/wt150/Configuration_adv.h | 6 +++--- 43 files changed, 129 insertions(+), 129 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index d74efa330..f7fc3d406 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/default/Configuration_adv.h b/Marlin/src/config/default/Configuration_adv.h index d74efa330..f7fc3d406 100644 --- a/Marlin/src/config/default/Configuration_adv.h +++ b/Marlin/src/config/default/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h index bac805e2a..c451f0642 100644 --- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h +++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h index 3312831c5..5928bdcd8 100644 --- a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h index 33481688b..7b00dc53a 100644 --- a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h b/Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h index 721c99633..fd8c42e87 100644 --- a/Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h +++ b/Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h @@ -491,6 +491,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -581,9 +584,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/BIBO/TouchX/Configuration_adv.h b/Marlin/src/config/examples/BIBO/TouchX/Configuration_adv.h index 6d8a9309e..dd6afbbfd 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/Configuration_adv.h +++ b/Marlin/src/config/examples/BIBO/TouchX/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h index b6f6cb958..ec7c3b778 100644 --- a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h index 47b4e8d31..2a583e80a 100644 --- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 #define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h index b6f6cb958..ec7c3b778 100644 --- a/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/Cartesio/Configuration_adv.h b/Marlin/src/config/examples/Cartesio/Configuration_adv.h index bc018543a..edf506e2e 100644 --- a/Marlin/src/config/examples/Cartesio/Configuration_adv.h +++ b/Marlin/src/config/examples/Cartesio/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h index b039009a1..696d20213 100755 --- a/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h index 510f326c6..d649203b3 100644 --- a/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/Creality/Ender/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender/Configuration_adv.h index 0952a2c8b..a21f541dc 100644 --- a/Marlin/src/config/examples/Creality/Ender/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/Felix/Configuration_adv.h b/Marlin/src/config/examples/Felix/Configuration_adv.h index 04a60dca1..1a755196c 100644 --- a/Marlin/src/config/examples/Felix/Configuration_adv.h +++ b/Marlin/src/config/examples/Felix/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h index 3fe6086b7..80f2b52a2 100644 --- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h +++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h b/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h index 8c9bad66b..763cf76da 100644 --- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h +++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h index 10e158ea9..12ed9b789 100644 --- a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h +++ b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/MakerParts/Configuration_adv.h b/Marlin/src/config/examples/MakerParts/Configuration_adv.h index 251cc13ae..bddaeade4 100644 --- a/Marlin/src/config/examples/MakerParts/Configuration_adv.h +++ b/Marlin/src/config/examples/MakerParts/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus #define LCD_TIMEOUT_TO_STATUS 30000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 #define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h index e8564fa5c..94ae68871 100644 --- a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h +++ b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 #define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h index d19f36752..cd7d0aba5 100644 --- a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h +++ b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 #define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h index ab4923160..5170c3d43 100644 --- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h +++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h index 9c427fc78..e97930502 100644 --- a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h +++ b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h @@ -491,6 +491,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -581,9 +584,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/RigidBot/Configuration_adv.h b/Marlin/src/config/examples/RigidBot/Configuration_adv.h index b2c1074d5..f44f75499 100644 --- a/Marlin/src/config/examples/RigidBot/Configuration_adv.h +++ b/Marlin/src/config/examples/RigidBot/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/SCARA/Configuration_adv.h b/Marlin/src/config/examples/SCARA/Configuration_adv.h index 5f535c7f2..b2bde31fa 100644 --- a/Marlin/src/config/examples/SCARA/Configuration_adv.h +++ b/Marlin/src/config/examples/SCARA/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h index dea3d7119..6dffde953 100644 --- a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h +++ b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/TheBorg/Configuration_adv.h b/Marlin/src/config/examples/TheBorg/Configuration_adv.h index b803b1331..3de031bd0 100644 --- a/Marlin/src/config/examples/TheBorg/Configuration_adv.h +++ b/Marlin/src/config/examples/TheBorg/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h index 83e268851..e924275f8 100644 --- a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h +++ b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h index 0322af662..ae3ad1ca2 100644 --- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h +++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h index ce7739563..284114ca2 100644 --- a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h +++ b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h @@ -503,6 +503,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -593,9 +596,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 #define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h index b71b38352..90c2b6726 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h +++ b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h index a3c278774..ba2fd0242 100644 --- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h +++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h @@ -492,6 +492,9 @@ // The timeout (in ms) to return to the status screen from sub-menus #define LCD_TIMEOUT_TO_STATUS 60000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -582,9 +585,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h index fd147fd35..4a5cc93b6 100644 --- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h @@ -492,6 +492,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -582,9 +585,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h index 4c1ba8376..7ad6c4191 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h @@ -492,6 +492,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -582,9 +585,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h index 6f781bc95..e2444b440 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h @@ -492,6 +492,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -582,9 +585,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/delta/generic/Configuration_adv.h b/Marlin/src/config/examples/delta/generic/Configuration_adv.h index 6f781bc95..e2444b440 100644 --- a/Marlin/src/config/examples/delta/generic/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/generic/Configuration_adv.h @@ -492,6 +492,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -582,9 +585,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h b/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h index 6f781bc95..e2444b440 100644 --- a/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h @@ -492,6 +492,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -582,9 +585,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h b/Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h index 9b836c723..93df5688f 100644 --- a/Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h @@ -497,6 +497,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -587,9 +590,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h b/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h index 2a5e39e8b..1cc0fe829 100644 --- a/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h @@ -492,6 +492,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -582,9 +585,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h index 231a00420..dc958a01d 100644 --- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h +++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/makibox/Configuration_adv.h b/Marlin/src/config/examples/makibox/Configuration_adv.h index e98699f92..e5ecde2d2 100644 --- a/Marlin/src/config/examples/makibox/Configuration_adv.h +++ b/Marlin/src/config/examples/makibox/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h index f2cd424e2..af842f9c5 100644 --- a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h @@ -490,6 +490,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -580,9 +583,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT diff --git a/Marlin/src/config/examples/wt150/Configuration_adv.h b/Marlin/src/config/examples/wt150/Configuration_adv.h index 6bbb8be3a..02e650e1c 100644 --- a/Marlin/src/config/examples/wt150/Configuration_adv.h +++ b/Marlin/src/config/examples/wt150/Configuration_adv.h @@ -491,6 +491,9 @@ // The timeout (in ms) to return to the status screen from sub-menus //#define LCD_TIMEOUT_TO_STATUS 15000 +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + /** * LED Control Menu * Enable this feature to add LED Control to the LCD menu @@ -581,9 +584,6 @@ //#define LCD_PROGRESS_BAR_TEST #endif - // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY - // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT From f6cc89ec7c287b3047b100dd5ac0ecf4d8706bcf Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 17 Feb 2018 08:01:36 -0600 Subject: [PATCH 3/3] LCD_PROGRESS_BAR w/out SDSUPPORT for character LCD --- Marlin/src/inc/SanityCheck.h | 4 ++-- Marlin/src/lcd/ultralcd_impl_HD44780.h | 28 ++++++++++++-------------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index 3ca4aa623..af1762dc3 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -327,8 +327,8 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE, * Progress Bar */ #if ENABLED(LCD_PROGRESS_BAR) - #if DISABLED(SDSUPPORT) - #error "LCD_PROGRESS_BAR requires SDSUPPORT." + #if DISABLED(SDSUPPORT) && DISABLED(LCD_SET_PROGRESS_MANUALLY) + #error "LCD_PROGRESS_BAR requires SDSUPPORT or LCD_SET_PROGRESS_MANUALLY." #elif DISABLED(ULTRA_LCD) #error "LCD_PROGRESS_BAR requires a character LCD." #elif ENABLED(DOGLCD) diff --git a/Marlin/src/lcd/ultralcd_impl_HD44780.h b/Marlin/src/lcd/ultralcd_impl_HD44780.h index 0d011e30f..70dc5294b 100644 --- a/Marlin/src/lcd/ultralcd_impl_HD44780.h +++ b/Marlin/src/lcd/ultralcd_impl_HD44780.h @@ -426,23 +426,21 @@ static void lcd_set_custom_characters( createChar_P(LCD_FEEDRATE_CHAR, feedrate); createChar_P(LCD_CLOCK_CHAR, clock); - #if ENABLED(SDSUPPORT) - #if ENABLED(LCD_PROGRESS_BAR) - if (screen_charset == CHARSET_INFO) { // 3 Progress bar characters for info screen - for (int16_t i = 3; i--;) - createChar_P(LCD_STR_PROGRESS[i], progress[i]); - } - else - #endif - { // SD Card sub-menu special characters - createChar_P(LCD_UPLEVEL_CHAR, uplevel); + #if ENABLED(LCD_PROGRESS_BAR) + if (screen_charset == CHARSET_INFO) { // 3 Progress bar characters for info screen + for (int16_t i = 3; i--;) + createChar_P(LCD_STR_PROGRESS[i], progress[i]); + } + else + #endif + { + createChar_P(LCD_UPLEVEL_CHAR, uplevel); + #if ENABLED(SDSUPPORT) + // SD Card sub-menu special characters createChar_P(LCD_STR_REFRESH[0], refresh); createChar_P(LCD_STR_FOLDER[0], folder); - } - #else - // With no SD support, only need the uplevel character - createChar_P(LCD_UPLEVEL_CHAR, uplevel); - #endif + #endif + } } } }