mirror of
https://github.com/MarlinFirmware/Configurations.git
synced 2025-07-07 06:57:39 -06:00
Scott Lahteine
parent
c974c5e7c5
commit
efee2cc6c8
292 changed files with 6092 additions and 6974 deletions
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1416,9 +1416,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1448,28 +1445,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1821,14 +1824,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
#define LCD_SHOW_E_TOTAL
|
#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
#define LCD_SHOW_E_TOTAL
|
#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
#define LCD_SHOW_E_TOTAL
|
#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
#define LCD_SHOW_E_TOTAL
|
#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
#define LCD_SHOW_E_TOTAL
|
#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
#define LCD_SHOW_E_TOTAL
|
#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
#define LCD_SHOW_E_TOTAL
|
#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1815,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1412,9 +1412,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1444,28 +1441,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1817,14 +1820,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1408,9 +1408,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1440,28 +1437,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1813,14 +1816,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1415,9 +1415,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
#define LCD_DECIMAL_SMALL_XY
|
#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1447,28 +1444,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1820,14 +1823,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
#define LCD_DECIMAL_SMALL_XY
|
#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
#define LCD_SHOW_E_TOTAL
|
#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1390,9 +1390,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1422,28 +1419,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1795,14 +1798,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
#define LCD_DECIMAL_SMALL_XY
|
#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1409,9 +1409,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
#define LCD_DECIMAL_SMALL_XY
|
#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1441,28 +1438,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1814,14 +1817,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
#define LCD_SHOW_E_TOTAL
|
#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
//#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
//#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1408,9 +1408,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1440,28 +1437,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1813,14 +1816,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1408,9 +1408,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1440,28 +1437,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1813,14 +1816,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1408,9 +1408,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1440,28 +1437,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1813,14 +1816,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1403,9 +1403,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1435,28 +1432,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1808,14 +1811,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1408,9 +1408,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1440,28 +1437,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1813,14 +1816,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1408,9 +1408,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1440,28 +1437,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1813,14 +1816,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1408,9 +1408,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1440,28 +1437,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1813,14 +1816,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1408,9 +1408,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1440,28 +1437,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1813,14 +1816,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1408,9 +1408,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1440,28 +1437,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1813,14 +1816,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1408,9 +1408,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1440,28 +1437,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1813,14 +1816,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
//#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
//#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
//#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -1407,9 +1407,6 @@
|
||||||
// On the Info Screen, display XY with one decimal place when possible
|
// On the Info Screen, display XY with one decimal place when possible
|
||||||
//#define LCD_DECIMAL_SMALL_XY
|
//#define LCD_DECIMAL_SMALL_XY
|
||||||
|
|
||||||
// Add an 'M73' G-code to set the current percentage
|
|
||||||
#define LCD_SET_PROGRESS_MANUALLY
|
|
||||||
|
|
||||||
// Show the E position (filament used) during printing
|
// Show the E position (filament used) during printing
|
||||||
//#define LCD_SHOW_E_TOTAL
|
//#define LCD_SHOW_E_TOTAL
|
||||||
|
|
||||||
|
|
@ -1439,28 +1436,34 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
|
// Add the G-code 'M73' to set / report the current job progress
|
||||||
|
#define SET_PROGRESS_MANUALLY
|
||||||
|
#if ENABLED(SET_PROGRESS_MANUALLY)
|
||||||
|
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
|
||||||
|
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
||||||
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
|
//#define M73_REPORT // Report progress to host with 'M73'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options
|
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
||||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#if CAN_SHOW_REMAINING_TIME
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#if ENABLED(SHOW_REMAINING_TIME)
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
|
||||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||||
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
#define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
|
||||||
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
#define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
|
||||||
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
//#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
|
||||||
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
//#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1812,14 +1815,8 @@
|
||||||
#endif // HAS_MARLINUI_U8GLIB
|
#endif // HAS_MARLINUI_U8GLIB
|
||||||
|
|
||||||
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
|
||||||
// Show SD percentage next to the progress bar
|
#define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens
|
||||||
//#define SHOW_SD_PERCENT
|
//#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay
|
||||||
|
|
||||||
// Enable to save many cycles by drawing a hollow frame on Menu Screens
|
|
||||||
#define MENU_HOLLOW_FRAME
|
|
||||||
|
|
||||||
// Swap the CW/CCW indicators in the graphics overlay
|
|
||||||
//#define OVERLAY_GFX_REVERSE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue