mirror of
https://github.com/MarlinFirmware/Configurations.git
synced 2025-07-07 23:17:38 -06:00
parent
0bd7526633
commit
503c6df298
295 changed files with 2810 additions and 2220 deletions
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1482,24 +1482,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1478,24 +1478,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1474,24 +1474,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1481,24 +1481,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1474,24 +1474,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1475,24 +1475,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1474,24 +1474,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1474,24 +1474,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1474,24 +1474,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1469,24 +1469,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1474,24 +1474,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1474,24 +1474,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1474,24 +1474,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1474,24 +1474,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1474,24 +1474,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1474,24 +1474,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
//#define SET_PROGRESS_MANUALLY
|
//#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
|
||||||
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
|
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
|
||||||
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
|
@ -1473,24 +1473,26 @@
|
||||||
|
|
||||||
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
|
||||||
|
|
||||||
// Add the G-code 'M73' to set / report the current job progress
|
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
|
||||||
#define SET_PROGRESS_MANUALLY
|
#define SET_PROGRESS_MANUALLY
|
||||||
#if ENABLED(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_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_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
|
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
|
||||||
#if ENABLED(SET_INTERACTION_TIME)
|
//#define M73_REPORT // Report M73 values to host
|
||||||
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
#if BOTH(M73_REPORT, SDSUPPORT)
|
||||||
|
#define M73_REPORT_SD_ONLY // Report only when printing from SD
|
||||||
#endif
|
#endif
|
||||||
//#define M73_REPORT // Report progress to host with 'M73'
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// LCD Print Progress options, multiple can be rotated depending on screen layout
|
// LCD Print Progress options. Multiple times may be displayed in turn.
|
||||||
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||||
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
|
||||||
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
|
||||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
|
||||||
|
#if ENABLED(SET_INTERACTION_TIME)
|
||||||
|
#define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change)
|
||||||
|
#endif
|
||||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this
|
||||||
|
|
||||||
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
#if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
|
||||||
|
|
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