Pascal de Bruijn
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
3 additions and
4 deletions
-
Marlin/src/lcd/dogm/status_screen_DOGM.cpp
|
|
|
@ -448,10 +448,10 @@ void MarlinUI::draw_status_screen() { |
|
|
|
#endif |
|
|
|
} |
|
|
|
|
|
|
|
constexpr bool can_show_days = DISABLED(DOGM_SD_PERCENT) || ENABLED(ROTATE_PROGRESS_DISPLAY); |
|
|
|
if (ev != lastElapsed) { |
|
|
|
lastElapsed = ev; |
|
|
|
const bool has_days = (elapsed.value >= 60*60*24L); |
|
|
|
const uint8_t len = elapsed.toDigital(elapsed_string, has_days); |
|
|
|
const uint8_t len = elapsed.toDigital(elapsed_string, can_show_days && elapsed.value >= 60*60*24L); |
|
|
|
elapsed_x_pos = _SD_INFO_X(len); |
|
|
|
|
|
|
|
#if ENABLED(SHOW_REMAINING_TIME) |
|
|
|
@ -468,8 +468,7 @@ void MarlinUI::draw_status_screen() { |
|
|
|
} |
|
|
|
else { |
|
|
|
duration_t estimation = timeval; |
|
|
|
const bool has_days = (estimation.value >= 60*60*24L); |
|
|
|
const uint8_t len = estimation.toDigital(estimation_string, has_days); |
|
|
|
const uint8_t len = estimation.toDigital(estimation_string, can_show_days && estimation.value >= 60*60*24L); |
|
|
|
estimation_x_pos = _SD_INFO_X(len |
|
|
|
#if !BOTH(DOGM_SD_PERCENT, ROTATE_PROGRESS_DISPLAY) |
|
|
|
+ 1 |
|
|
|
|
