melch
/
Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

🐛 Fix SHOW_REMAINING_TIME compile (#23503)

Browse Source
x301
Jim Watson 3 years ago committed by Scott Lahteine
parent 7135c3b185
commit 242192d03d
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File

2
Marlin/src/lcd/marlinui.h
Unescape Escape View File

@ -293,6 +293,7 @@ public:
static void set_progress(const progress_t p) { progress_override = _MIN(p, 100U * (PROGRESS_SCALE)); } 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 set_progress_done() { progress_override = (PROGRESS_MASK + 1U) + 100U * (PROGRESS_SCALE); }
static void progress_reset() { if (progress_override & (PROGRESS_MASK + 1U)) set_progress(0); } static void progress_reset() { if (progress_override & (PROGRESS_MASK + 1U)) set_progress(0); }
#endif
#if ENABLED(SHOW_REMAINING_TIME) #if ENABLED(SHOW_REMAINING_TIME)
static uint32_t _calculated_remaining_time() { static uint32_t _calculated_remaining_time() {
const duration_t elapsed = print_job_timer.duration(); const duration_t elapsed = print_job_timer.duration();
@ -308,7 +309,6 @@ public:
FORCE_INLINE static uint32_t get_remaining_time() { return _calculated_remaining_time(); } FORCE_INLINE static uint32_t get_remaining_time() { return _calculated_remaining_time(); }
#endif #endif
#endif #endif
#endif
static progress_t _get_progress(); static progress_t _get_progress();
#if HAS_PRINT_PROGRESS_PERMYRIAD #if HAS_PRINT_PROGRESS_PERMYRIAD
FORCE_INLINE static uint16_t get_progress_permyriad() { return _get_progress(); } FORCE_INLINE static uint16_t get_progress_permyriad() { return _get_progress(); }

Write Preview
Loading…
Cancel
Save