Fix DOGM progress bar with LCD_SET_PROGRESS_MANUALLY

This commit is contained in:
Scott Lahteine 2018-02-21 19:25:50 -06:00
parent 343c17d5b3
commit 72f63a4980

View File

@ -654,6 +654,12 @@ void lcd_status_screen() {
ENCODER_RATE_MULTIPLY(false); ENCODER_RATE_MULTIPLY(false);
#endif #endif
#if ENABLED(LCD_SET_PROGRESS_MANUALLY) && (ENABLED(LCD_PROGRESS_BAR) || ENABLED(DOGLCD))
// Progress bar % comes from SD when actively printing
if (IS_SD_PRINTING)
progress_bar_percent = card.percentDone();
#endif
#if ENABLED(LCD_PROGRESS_BAR) #if ENABLED(LCD_PROGRESS_BAR)
// //
@ -662,12 +668,6 @@ void lcd_status_screen() {
// share the same line on the display. // 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
millis_t ms = millis(); millis_t ms = millis();
// If the message will blink rather than expire... // If the message will blink rather than expire...