From c71f542d612df793102eb776d99336816c030177 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 17 Feb 2018 08:04:42 -0600 Subject: [PATCH 1/4] LCD_PROGRESS_BAR w/out SDSUPPORT for character LCD --- Marlin/SanityCheck.h | 4 ++-- Marlin/ultralcd_impl_HD44780.h | 28 +++++++++++++--------------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index 8f7ca2ecb..8a064dbab 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -329,8 +329,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/ultralcd_impl_HD44780.h b/Marlin/ultralcd_impl_HD44780.h index 11a5174b9..b7e20498a 100644 --- a/Marlin/ultralcd_impl_HD44780.h +++ b/Marlin/ultralcd_impl_HD44780.h @@ -421,23 +421,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 + } } } } From c67cefd913f8985b21a4464dd44e7efef61dd621 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 17 Feb 2018 08:06:11 -0600 Subject: [PATCH 2/4] 2.0.x parity in ultralcd__impl_HD44780.h --- Marlin/ultralcd_impl_HD44780.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Marlin/ultralcd_impl_HD44780.h b/Marlin/ultralcd_impl_HD44780.h index b7e20498a..a69534cce 100644 --- a/Marlin/ultralcd_impl_HD44780.h +++ b/Marlin/ultralcd_impl_HD44780.h @@ -116,7 +116,7 @@ extern volatile uint8_t buttons; //an extended version of the last checked butt #define B_DW (_BV(BL_DW)) #define B_RI (_BV(BL_RI)) #define B_ST (_BV(BL_ST)) - #define LCD_CLICKED ((buttons & B_MI) || (buttons & B_ST)) + #define LCD_CLICKED (buttons & (B_MI|B_ST)) #endif #endif // ULTIPANEL @@ -797,7 +797,7 @@ static void lcd_implementation_status_screen() { lcd.setCursor(0, 1); // If the first line has two extruder temps, - // show more temperatures on the next line. + // show more temperatures on the next line #if HOTENDS > 2 || (HOTENDS > 1 && TEMP_SENSOR_BED) @@ -1321,18 +1321,18 @@ static void lcd_implementation_status_screen() { } clear_custom_char(&new_char); - new_char.custom_char_bits[0] = 0B11111U; // char #0 is used for the top line of the box + new_char.custom_char_bits[0] = 0b11111U; // char #0 is used for the top line of the box lcd.createChar(0, (uint8_t*)&new_char); clear_custom_char(&new_char); k = (GRID_MAX_POINTS_Y) * pixels_per_y_mesh_pnt + 1; // row of pixels for the bottom box line l = k % (ULTRA_Y_PIXELS_PER_CHAR); // row within relevant character cell - new_char.custom_char_bits[l] = 0B11111U; // char #1 is used for the bottom line of the box + new_char.custom_char_bits[l] = 0b11111U; // char #1 is used for the bottom line of the box lcd.createChar(1, (uint8_t*)&new_char); clear_custom_char(&new_char); for (j = 0; j < ULTRA_Y_PIXELS_PER_CHAR; j++) - new_char.custom_char_bits[j] = 0B10000U; // char #2 is used for the left edge of the box + new_char.custom_char_bits[j] = 0b10000U; // char #2 is used for the left edge of the box lcd.createChar(2, (uint8_t*)&new_char); clear_custom_char(&new_char); From a1f0d9d3496d70ebb9ccc88d4bbcde17766dc082 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 17 Feb 2018 08:07:32 -0600 Subject: [PATCH 3/4] Allow LCD_SET_PROGRESS_MANUALLY without SDSUPPORT --- Marlin/ultralcd_impl_DOGM.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Marlin/ultralcd_impl_DOGM.h b/Marlin/ultralcd_impl_DOGM.h index 1c6cf614e..4d0121705 100644 --- a/Marlin/ultralcd_impl_DOGM.h +++ b/Marlin/ultralcd_impl_DOGM.h @@ -518,7 +518,6 @@ static void lcd_implementation_status_screen() { // entry to the status screen. Nozzle, bed, and // fan outline bits don't change. // - if (PAGE_UNDER(STATUS_SCREENHEIGHT + 1)) { u8g.drawBitmapP( @@ -567,11 +566,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) @@ -582,11 +579,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) @@ -637,7 +635,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); @@ -646,7 +643,7 @@ static void lcd_implementation_status_screen() { lcd_print(buffer); } - #endif + #endif // SDSUPPORT || LCD_SET_PROGRESS_MANUALLY // // XYZ Coordinates From 3a1fedaee647350daeef73bd5e41c8f832b1397f Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 17 Feb 2018 08:10:44 -0600 Subject: [PATCH 4/4] Update LCD_SET_PROGRESS_MANUALLY in configs --- Marlin/Configuration_adv.h | 6 +++--- .../AlephObjects/TAZ4/Configuration_adv.h | 6 +++--- Marlin/example_configurations/Anet/A6/Configuration_adv.h | 6 +++--- Marlin/example_configurations/Anet/A8/Configuration_adv.h | 6 +++--- .../example_configurations/BIBO/TouchX/Configuration_adv.h | 6 +++--- .../example_configurations/BQ/Hephestos/Configuration_adv.h | 6 +++--- .../BQ/Hephestos_2/Configuration_adv.h | 6 +++--- Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h | 6 +++--- Marlin/example_configurations/Cartesio/Configuration_adv.h | 6 +++--- .../Creality/CR-10/Configuration_adv.h | 6 +++--- .../Creality/CR-10S/Configuration_adv.h | 6 +++--- .../Creality/Ender/Configuration_adv.h | 6 +++--- Marlin/example_configurations/Felix/Configuration_adv.h | 6 +++--- .../FolgerTech/i3-2020/Configuration_adv.h | 6 +++--- .../Infitary/i3-M508/Configuration_adv.h | 6 +++--- .../example_configurations/JGAurora/A5/Configuration_adv.h | 6 +++--- .../example_configurations/Malyan/M150/Configuration_adv.h | 6 +++--- .../Micromake/C1/enhanced/Configuration_adv.h | 6 +++--- Marlin/example_configurations/RigidBot/Configuration_adv.h | 6 +++--- Marlin/example_configurations/SCARA/Configuration_adv.h | 6 +++--- .../example_configurations/Sanguinololu/Configuration_adv.h | 6 +++--- Marlin/example_configurations/TinyBoy2/Configuration_adv.h | 6 +++--- .../Velleman/K8200/Configuration_adv.h | 6 +++--- .../Velleman/K8400/Configuration_adv.h | 6 +++--- .../Wanhao/Duplicator 6/Configuration_adv.h | 6 +++--- .../delta/FLSUN/auto_calibrate/Configuration_adv.h | 6 +++--- .../delta/FLSUN/kossel/Configuration_adv.h | 6 +++--- .../delta/FLSUN/kossel_mini/Configuration_adv.h | 6 +++--- .../delta/generic/Configuration_adv.h | 6 +++--- .../delta/kossel_mini/Configuration_adv.h | 6 +++--- .../delta/kossel_pro/Configuration_adv.h | 6 +++--- .../delta/kossel_xl/Configuration_adv.h | 6 +++--- .../gCreate/gMax1.5+/Configuration_adv.h | 6 +++--- Marlin/example_configurations/makibox/Configuration_adv.h | 6 +++--- .../tvrrug/Round2/Configuration_adv.h | 6 +++--- Marlin/example_configurations/wt150/Configuration_adv.h | 6 +++--- 36 files changed, 108 insertions(+), 108 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 70227df5d..d0e807783 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/example_configurations/AlephObjects/TAZ4/Configuration_adv.h b/Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h index 9b07a9df4..6bffd07f9 100644 --- a/Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/Anet/A6/Configuration_adv.h b/Marlin/example_configurations/Anet/A6/Configuration_adv.h index f82c2f845..c88710e9b 100644 --- a/Marlin/example_configurations/Anet/A6/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/Anet/A8/Configuration_adv.h b/Marlin/example_configurations/Anet/A8/Configuration_adv.h index 58b033a32..510941bb2 100644 --- a/Marlin/example_configurations/Anet/A8/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/BIBO/TouchX/Configuration_adv.h b/Marlin/example_configurations/BIBO/TouchX/Configuration_adv.h index 70227df5d..d0e807783 100644 --- a/Marlin/example_configurations/BIBO/TouchX/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/BQ/Hephestos/Configuration_adv.h b/Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h index 83e44b135..167d598c4 100644 --- a/Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/BQ/Hephestos_2/Configuration_adv.h b/Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h index f2ea63988..ea8c551fc 100644 --- a/Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/BQ/WITBOX/Configuration_adv.h b/Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h index 83e44b135..167d598c4 100644 --- a/Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/Cartesio/Configuration_adv.h b/Marlin/example_configurations/Cartesio/Configuration_adv.h index a747bd5af..0ce782755 100644 --- a/Marlin/example_configurations/Cartesio/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/Creality/CR-10/Configuration_adv.h b/Marlin/example_configurations/Creality/CR-10/Configuration_adv.h index c90928176..15f000a70 100755 --- a/Marlin/example_configurations/Creality/CR-10/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/Creality/CR-10S/Configuration_adv.h b/Marlin/example_configurations/Creality/CR-10S/Configuration_adv.h index 6619ebe44..6cb91e1e8 100644 --- a/Marlin/example_configurations/Creality/CR-10S/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/Creality/Ender/Configuration_adv.h b/Marlin/example_configurations/Creality/Ender/Configuration_adv.h index 049da6943..f6db8ba18 100644 --- a/Marlin/example_configurations/Creality/Ender/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h index 44df7a159..aab35dc17 100644 --- a/Marlin/example_configurations/Felix/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/FolgerTech/i3-2020/Configuration_adv.h b/Marlin/example_configurations/FolgerTech/i3-2020/Configuration_adv.h index cdabd4ede..5402ec2ac 100644 --- a/Marlin/example_configurations/FolgerTech/i3-2020/Configuration_adv.h +++ b/Marlin/example_configurations/FolgerTech/i3-2020/Configuration_adv.h @@ -489,6 +489,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 @@ -579,9 +582,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/example_configurations/Infitary/i3-M508/Configuration_adv.h b/Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h index 61d1bffc5..cd710f3e4 100644 --- a/Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/JGAurora/A5/Configuration_adv.h b/Marlin/example_configurations/JGAurora/A5/Configuration_adv.h index 37287989b..5eb7dba12 100644 --- a/Marlin/example_configurations/JGAurora/A5/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/Malyan/M150/Configuration_adv.h b/Marlin/example_configurations/Malyan/M150/Configuration_adv.h index 6bd074850..2718e733c 100644 --- a/Marlin/example_configurations/Malyan/M150/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/Micromake/C1/enhanced/Configuration_adv.h b/Marlin/example_configurations/Micromake/C1/enhanced/Configuration_adv.h index 4c4f1d4c9..2cd5f87b6 100644 --- a/Marlin/example_configurations/Micromake/C1/enhanced/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/RigidBot/Configuration_adv.h b/Marlin/example_configurations/RigidBot/Configuration_adv.h index 705654155..e8066f11a 100644 --- a/Marlin/example_configurations/RigidBot/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h index 80e614834..4d8c4eb55 100644 --- a/Marlin/example_configurations/SCARA/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/Sanguinololu/Configuration_adv.h b/Marlin/example_configurations/Sanguinololu/Configuration_adv.h index 1b22fbfd4..570891a21 100644 --- a/Marlin/example_configurations/Sanguinololu/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/TinyBoy2/Configuration_adv.h b/Marlin/example_configurations/TinyBoy2/Configuration_adv.h index f4da9508d..4b04e8d20 100644 --- a/Marlin/example_configurations/TinyBoy2/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/Velleman/K8200/Configuration_adv.h b/Marlin/example_configurations/Velleman/K8200/Configuration_adv.h index 7b2478cbe..801f5463d 100644 --- a/Marlin/example_configurations/Velleman/K8200/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/Velleman/K8400/Configuration_adv.h b/Marlin/example_configurations/Velleman/K8400/Configuration_adv.h index b6d14db21..85d130ac9 100644 --- a/Marlin/example_configurations/Velleman/K8400/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/Wanhao/Duplicator 6/Configuration_adv.h b/Marlin/example_configurations/Wanhao/Duplicator 6/Configuration_adv.h index 9420b7bea..7a8d29312 100644 --- a/Marlin/example_configurations/Wanhao/Duplicator 6/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h index a5642bb19..3684f9f52 100644 --- a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/delta/FLSUN/kossel/Configuration_adv.h b/Marlin/example_configurations/delta/FLSUN/kossel/Configuration_adv.h index 0ca71dc33..200811bec 100644 --- a/Marlin/example_configurations/delta/FLSUN/kossel/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h index 9f51c5abc..50225cf58 100644 --- a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h index 9f51c5abc..50225cf58 100644 --- a/Marlin/example_configurations/delta/generic/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h index 9f51c5abc..50225cf58 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/delta/kossel_pro/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h index 55f29029a..7e7637844 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/delta/kossel_xl/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h index 5f4938def..fb88a7742 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/gCreate/gMax1.5+/Configuration_adv.h b/Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h index 62dc22be4..8911ef61a 100644 --- a/Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h index fc9df7169..0de85222b 100644 --- a/Marlin/example_configurations/makibox/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h index 7b7b1a847..93cb13e63 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/example_configurations/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/example_configurations/wt150/Configuration_adv.h b/Marlin/example_configurations/wt150/Configuration_adv.h index e71862f49..c0ca835e6 100644 --- a/Marlin/example_configurations/wt150/Configuration_adv.h +++ b/Marlin/example_configurations/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