From d6a4c3079dc261b94aeccfc5f2031b589744bc67 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 25 Mar 2020 20:47:27 -0500
Subject: [PATCH] Tweak ui.finish_status
---
Marlin/src/lcd/ultralcd.cpp | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index 1cb23baa25..7ff1440559 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -524,7 +524,7 @@ void MarlinUI::status_screen() {
#if PROGRESS_MSG_EXPIRE > 0
// Handle message expire
- if (expire_status_ms > 0) {
+ if (expire_status_ms) {
// Expire the message if a job is active and the bar has ticks
if (get_progress_percent() > 2 && !print_job_timer.isPaused()) {
@@ -1337,15 +1337,19 @@ void MarlinUI::update() {
UNUSED(persist);
#endif
+ #if ENABLED(LCD_PROGRESS_BAR) || BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
+ const millis_t ms = millis();
+ #endif
+
#if ENABLED(LCD_PROGRESS_BAR)
- progress_bar_ms = millis();
+ progress_bar_ms = ms;
#if PROGRESS_MSG_EXPIRE > 0
- expire_status_ms = persist ? 0 : progress_bar_ms + PROGRESS_MSG_EXPIRE;
+ expire_status_ms = persist ? 0 : ms + PROGRESS_MSG_EXPIRE;
#endif
#endif
#if BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
- next_filament_display = millis() + 5000UL; // Show status message for 5s
+ next_filament_display = ms + 5000UL; // Show status message for 5s
#endif
#if HAS_SPI_LCD && ENABLED(STATUS_MESSAGE_SCROLLING)