From 242192d03de4af3dcd208dbcc4c1d609a25bce64 Mon Sep 17 00:00:00 2001
From: Jim Watson <j-watson@ntlworld.com>
Date: Wed, 12 Jan 2022 16:13:21 +0000
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20SHOW=5FREMAINING=5FTIME=20?=
=?UTF-8?q?compile=20(#23503)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/src/lcd/marlinui.h | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index f409970e42..9933841f02 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -293,20 +293,20 @@ public:
static void set_progress(const progress_t p) { progress_override = _MIN(p, 100U * (PROGRESS_SCALE)); }
static void set_progress_done() { progress_override = (PROGRESS_MASK + 1U) + 100U * (PROGRESS_SCALE); }
static void progress_reset() { if (progress_override & (PROGRESS_MASK + 1U)) set_progress(0); }
- #if ENABLED(SHOW_REMAINING_TIME)
- static uint32_t _calculated_remaining_time() {
- const duration_t elapsed = print_job_timer.duration();
- const progress_t progress = _get_progress();
- return progress ? elapsed.value * (100 * (PROGRESS_SCALE) - progress) / progress : 0;
- }
- #if ENABLED(USE_M73_REMAINING_TIME)
- static uint32_t remaining_time;
- FORCE_INLINE static void set_remaining_time(const uint32_t r) { remaining_time = r; }
- FORCE_INLINE static uint32_t get_remaining_time() { return remaining_time ?: _calculated_remaining_time(); }
- FORCE_INLINE static void reset_remaining_time() { set_remaining_time(0); }
- #else
- FORCE_INLINE static uint32_t get_remaining_time() { return _calculated_remaining_time(); }
- #endif
+ #endif
+ #if ENABLED(SHOW_REMAINING_TIME)
+ static uint32_t _calculated_remaining_time() {
+ const duration_t elapsed = print_job_timer.duration();
+ const progress_t progress = _get_progress();
+ return progress ? elapsed.value * (100 * (PROGRESS_SCALE) - progress) / progress : 0;
+ }
+ #if ENABLED(USE_M73_REMAINING_TIME)
+ static uint32_t remaining_time;
+ FORCE_INLINE static void set_remaining_time(const uint32_t r) { remaining_time = r; }
+ FORCE_INLINE static uint32_t get_remaining_time() { return remaining_time ?: _calculated_remaining_time(); }
+ FORCE_INLINE static void reset_remaining_time() { set_remaining_time(0); }
+ #else
+ FORCE_INLINE static uint32_t get_remaining_time() { return _calculated_remaining_time(); }
#endif
#endif
static progress_t _get_progress();