mirror of
https://github.com/MarlinFirmware/Marlin.git
synced 2025-02-28 03:47:04 +00:00
Add LCD_SET_PROGRESS_MANUALLY
This commit is contained in:
parent
23dbaaf03b
commit
5f708d47ce
31 changed files with 164 additions and 34 deletions
Marlin
Configuration_adv.hMarlin_main.cppultralcd.cppultralcd.hultralcd_impl_DOGM.hultralcd_impl_HD44780.h
example_configurations
AlephObjects/TAZ4
Anet
BQ
Cartesio
Creality/CR-10
Felix
Folger Tech/i3-2020
Infitary/i3-M508
RigidBot
SCARA
Sanguinololu
TinyBoy2
Velleman/K8400
delta
FLSUN
generic
kossel_mini
kossel_pro
kossel_xl
gCreate/gMax1.5+
makibox
tvrrug/Round2
wt150
|
@ -535,6 +535,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -6022,7 +6022,7 @@ inline void gcode_G92() {
|
||||||
#if ENABLED(ULTIPANEL)
|
#if ENABLED(ULTIPANEL)
|
||||||
if (lcd_detected()) {
|
if (lcd_detected()) {
|
||||||
while (wait_for_user) idle();
|
while (wait_for_user) idle();
|
||||||
IS_SD_PRINTING ? LCD_MESSAGEPGM(MSG_RESUMING) : LCD_MESSAGEPGM(WELCOME_MSG);
|
print_job_timer.isPaused() ? LCD_MESSAGEPGM(WELCOME_MSG) : LCD_MESSAGEPGM(MSG_RESUMING);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
while (wait_for_user) idle();
|
while (wait_for_user) idle();
|
||||||
|
@ -7241,6 +7241,24 @@ inline void gcode_M42() {
|
||||||
|
|
||||||
#endif // AUTO_BED_LEVELING_UBL && UBL_G26_MESH_VALIDATION
|
#endif // AUTO_BED_LEVELING_UBL && UBL_G26_MESH_VALIDATION
|
||||||
|
|
||||||
|
#if ENABLED(ULTRA_LCD) && ENABLED(LCD_SET_PROGRESS_MANUALLY)
|
||||||
|
/**
|
||||||
|
* M73: Set percentage complete (for display on LCD)
|
||||||
|
*
|
||||||
|
* Example:
|
||||||
|
* M73 P25 ; Set progress to 25%
|
||||||
|
*
|
||||||
|
* Notes:
|
||||||
|
* This has no effect during an SD print job
|
||||||
|
*/
|
||||||
|
inline void gcode_M73() {
|
||||||
|
if (!IS_SD_PRINTING && parser.seen('P')) {
|
||||||
|
progress_bar_percent = parser.value_byte();
|
||||||
|
NOMORE(progress_bar_percent, 100);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif // ULTRA_LCD && LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* M75: Start print timer
|
* M75: Start print timer
|
||||||
*/
|
*/
|
||||||
|
@ -11090,6 +11108,11 @@ void process_next_command() {
|
||||||
break;
|
break;
|
||||||
#endif // AUTO_BED_LEVELING_UBL && UBL_G26_MESH_VALIDATION
|
#endif // AUTO_BED_LEVELING_UBL && UBL_G26_MESH_VALIDATION
|
||||||
|
|
||||||
|
#if ENABLED(ULTRA_LCD) && ENABLED(LCD_SET_PROGRESS_MANUALLY)
|
||||||
|
case 73: // M73: Set print progress percentage
|
||||||
|
gcode_M73(); break;
|
||||||
|
#endif
|
||||||
|
|
||||||
case 75: // M75: Start print timer
|
case 75: // M75: Start print timer
|
||||||
gcode_M75(); break;
|
gcode_M75(); break;
|
||||||
case 76: // M76: Pause print timer
|
case 76: // M76: Pause print timer
|
||||||
|
|
|
@ -535,6 +535,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -535,6 +535,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -535,6 +535,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -535,6 +535,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -535,6 +535,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -535,6 +535,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -535,6 +535,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -535,6 +535,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -535,6 +535,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -535,6 +535,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -535,6 +535,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -535,6 +535,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -524,6 +524,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -535,6 +535,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -535,6 +535,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -537,6 +537,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -537,6 +537,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -537,6 +537,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -537,6 +537,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -542,6 +542,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -537,6 +537,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -535,6 +535,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -535,6 +535,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -535,6 +535,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -535,6 +535,9 @@
|
||||||
//#define LCD_PROGRESS_BAR_TEST
|
//#define LCD_PROGRESS_BAR_TEST
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Add an 'M73' G-code to set the current percentage
|
||||||
|
//#define LCD_SET_PROGRESS_MANUALLY
|
||||||
|
|
||||||
// This allows hosts to request long names for files and folders with M33
|
// This allows hosts to request long names for files and folders with M33
|
||||||
//#define LONG_FILENAME_HOST_SUPPORT
|
//#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
|
|
|
@ -60,6 +60,10 @@
|
||||||
// Initialized by settings.load()
|
// Initialized by settings.load()
|
||||||
int16_t lcd_preheat_hotend_temp[2], lcd_preheat_bed_temp[2], lcd_preheat_fan_speed[2];
|
int16_t lcd_preheat_hotend_temp[2], lcd_preheat_bed_temp[2], lcd_preheat_fan_speed[2];
|
||||||
|
|
||||||
|
#if ENABLED(LCD_SET_PROGRESS_MANUALLY) && (ENABLED(LCD_PROGRESS_BAR) || ENABLED(DOGLCD))
|
||||||
|
uint8_t progress_bar_percent;
|
||||||
|
#endif
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_LCD_DISPLAY) && ENABLED(SDSUPPORT)
|
#if ENABLED(FILAMENT_LCD_DISPLAY) && ENABLED(SDSUPPORT)
|
||||||
millis_t previous_lcd_status_ms = 0;
|
millis_t previous_lcd_status_ms = 0;
|
||||||
#endif
|
#endif
|
||||||
|
@ -603,36 +607,52 @@ void lcd_status_screen() {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
millis_t ms = millis();
|
|
||||||
#if DISABLED(PROGRESS_MSG_ONCE)
|
//
|
||||||
if (ELAPSED(ms, progress_bar_ms + PROGRESS_BAR_MSG_TIME + PROGRESS_BAR_BAR_TIME)) {
|
// HD44780 implements the following message blinking and
|
||||||
progress_bar_ms = ms;
|
// message expiration because Status Line and Progress Bar
|
||||||
}
|
// share the same line on the display.
|
||||||
|
//
|
||||||
|
|
||||||
|
// Set current percentage from SD when actively printing
|
||||||
|
#if ENABLED(LCD_SET_PROGRESS_MANUALLY)
|
||||||
|
if (IS_SD_PRINTING)
|
||||||
|
progress_bar_percent = card.percentDone();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
millis_t ms = millis();
|
||||||
|
|
||||||
|
// If the message will blink rather than expire...
|
||||||
|
#if DISABLED(PROGRESS_MSG_ONCE)
|
||||||
|
if (ELAPSED(ms, progress_bar_ms + PROGRESS_BAR_MSG_TIME + PROGRESS_BAR_BAR_TIME))
|
||||||
|
progress_bar_ms = ms;
|
||||||
|
#endif
|
||||||
|
|
||||||
#if PROGRESS_MSG_EXPIRE > 0
|
#if PROGRESS_MSG_EXPIRE > 0
|
||||||
|
|
||||||
// Handle message expire
|
// Handle message expire
|
||||||
if (expire_status_ms > 0) {
|
if (expire_status_ms > 0) {
|
||||||
#if ENABLED(SDSUPPORT)
|
|
||||||
if (card.isFileOpen()) {
|
#if DISABLED(LCD_SET_PROGRESS_MANUALLY)
|
||||||
// Expire the message when printing is active
|
const uint8_t progress_bar_percent = card.percentDone();
|
||||||
if (IS_SD_PRINTING) {
|
#endif
|
||||||
if (ELAPSED(ms, expire_status_ms)) {
|
|
||||||
lcd_status_message[0] = '\0';
|
// Expire the message if a job is active and the bar has ticks
|
||||||
expire_status_ms = 0;
|
if (progress_bar_percent > 2 && !print_job_timer.isPaused()) {
|
||||||
}
|
if (ELAPSED(ms, expire_status_ms)) {
|
||||||
}
|
lcd_status_message[0] = '\0';
|
||||||
else {
|
|
||||||
expire_status_ms += LCD_UPDATE_INTERVAL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
expire_status_ms = 0;
|
expire_status_ms = 0;
|
||||||
}
|
}
|
||||||
#else
|
}
|
||||||
expire_status_ms = 0;
|
else {
|
||||||
#endif // SDSUPPORT
|
// Defer message expiration before bar appears
|
||||||
|
// and during any pause (not just SD)
|
||||||
|
expire_status_ms += LCD_UPDATE_INTERVAL;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
#endif // PROGRESS_MSG_EXPIRE
|
||||||
|
|
||||||
#endif // LCD_PROGRESS_BAR
|
#endif // LCD_PROGRESS_BAR
|
||||||
|
|
||||||
#if ENABLED(ULTIPANEL)
|
#if ENABLED(ULTIPANEL)
|
||||||
|
|
|
@ -168,6 +168,10 @@
|
||||||
#define LCD_CLICKED false
|
#define LCD_CLICKED false
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(LCD_SET_PROGRESS_MANUALLY) && (ENABLED(LCD_PROGRESS_BAR) || ENABLED(DOGLCD))
|
||||||
|
extern uint8_t progress_bar_percent;
|
||||||
|
#endif
|
||||||
|
|
||||||
#else // no LCD
|
#else // no LCD
|
||||||
|
|
||||||
inline void lcd_update() {}
|
inline void lcd_update() {}
|
||||||
|
|
|
@ -535,7 +535,7 @@ static void lcd_implementation_status_screen() {
|
||||||
// SD Card Symbol
|
// SD Card Symbol
|
||||||
//
|
//
|
||||||
|
|
||||||
if (PAGE_CONTAINS(42 - (TALL_FONT_CORRECTION), 51 - (TALL_FONT_CORRECTION))) {
|
if (card.isFileOpen() && PAGE_CONTAINS(42 - (TALL_FONT_CORRECTION), 51 - (TALL_FONT_CORRECTION))) {
|
||||||
// Upper box
|
// Upper box
|
||||||
u8g.drawBox(42, 42 - (TALL_FONT_CORRECTION), 8, 7); // 42-48 (or 41-47)
|
u8g.drawBox(42, 42 - (TALL_FONT_CORRECTION), 8, 7); // 42-48 (or 41-47)
|
||||||
// Right edge
|
// Right edge
|
||||||
|
@ -559,7 +559,11 @@ static void lcd_implementation_status_screen() {
|
||||||
PROGRESS_BAR_WIDTH, 4 - (TALL_FONT_CORRECTION)
|
PROGRESS_BAR_WIDTH, 4 - (TALL_FONT_CORRECTION)
|
||||||
);
|
);
|
||||||
|
|
||||||
if (IS_SD_PRINTING) {
|
#if DISABLED(LCD_SET_PROGRESS_MANUALLY)
|
||||||
|
const uint8_t progress_bar_percent = card.percentDone();
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (progress_bar_percent > 1) {
|
||||||
|
|
||||||
//
|
//
|
||||||
// Progress bar solid part
|
// Progress bar solid part
|
||||||
|
@ -568,7 +572,7 @@ static void lcd_implementation_status_screen() {
|
||||||
if (PAGE_CONTAINS(50, 51 - (TALL_FONT_CORRECTION))) // 50-51 (or just 50)
|
if (PAGE_CONTAINS(50, 51 - (TALL_FONT_CORRECTION))) // 50-51 (or just 50)
|
||||||
u8g.drawBox(
|
u8g.drawBox(
|
||||||
PROGRESS_BAR_X + 1, 50,
|
PROGRESS_BAR_X + 1, 50,
|
||||||
(uint16_t)((PROGRESS_BAR_WIDTH - 2) * card.percentDone() * 0.01), 2 - (TALL_FONT_CORRECTION)
|
(uint16_t)((PROGRESS_BAR_WIDTH - 2) * progress_bar_percent * 0.01), 2 - (TALL_FONT_CORRECTION)
|
||||||
);
|
);
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -579,7 +583,7 @@ static void lcd_implementation_status_screen() {
|
||||||
if (PAGE_CONTAINS(41, 48)) {
|
if (PAGE_CONTAINS(41, 48)) {
|
||||||
// Percent complete
|
// Percent complete
|
||||||
u8g.setPrintPos(55, 48);
|
u8g.setPrintPos(55, 48);
|
||||||
u8g.print(itostr3(card.percentDone()));
|
u8g.print(itostr3(progress_bar_percent));
|
||||||
u8g.print('%');
|
u8g.print('%');
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -200,9 +200,9 @@ extern volatile uint8_t buttons; //an extended version of the last checked butt
|
||||||
#include "utf_mapper.h"
|
#include "utf_mapper.h"
|
||||||
|
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
static millis_t progress_bar_ms = 0;
|
static millis_t progress_bar_ms = 0; // Start millis of the current progress bar cycle
|
||||||
#if PROGRESS_MSG_EXPIRE > 0
|
#if PROGRESS_MSG_EXPIRE > 0
|
||||||
static millis_t expire_status_ms = 0;
|
static millis_t expire_status_ms = 0; // millis at which to expire the status message
|
||||||
#endif
|
#endif
|
||||||
#define LCD_STR_PROGRESS "\x03\x04\x05"
|
#define LCD_STR_PROGRESS "\x03\x04\x05"
|
||||||
#endif
|
#endif
|
||||||
|
@ -841,10 +841,11 @@ static void lcd_implementation_status_screen() {
|
||||||
|
|
||||||
// Draw the progress bar if the message has shown long enough
|
// Draw the progress bar if the message has shown long enough
|
||||||
// or if there is no message set.
|
// or if there is no message set.
|
||||||
if (card.isFileOpen() && (ELAPSED(millis(), progress_bar_ms + PROGRESS_BAR_MSG_TIME) || !lcd_status_message[0])) {
|
#if DISABLED(LCD_SET_PROGRESS_MANUALLY)
|
||||||
const uint8_t percent = card.percentDone();
|
const uint8_t progress_bar_percent = card.percentDone();
|
||||||
if (percent) return lcd_draw_progress_bar(percent);
|
#endif
|
||||||
}
|
if (progress_bar_percent > 2 && (ELAPSED(millis(), progress_bar_ms + PROGRESS_BAR_MSG_TIME) || !lcd_status_message[0]))
|
||||||
|
return lcd_draw_progress_bar(progress_bar_percent);
|
||||||
|
|
||||||
#elif ENABLED(FILAMENT_LCD_DISPLAY) && ENABLED(SDSUPPORT)
|
#elif ENABLED(FILAMENT_LCD_DISPLAY) && ENABLED(SDSUPPORT)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue