CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shorter LCD remaining time to prevent overlap (#17181)

Browse Source
This commit is contained in:
Pascal de Bruijn 2020-03-16 20:11:55 +01:00 committed by GitHub
parent a662079cbc
commit 2fc0df1b39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/src/lcd/dogm/status_screen_DOGM.cpp
View File

@ -448,10 +448,10 @@ void MarlinUI::draw_status_screen() {
#endif #endif
} }
constexpr bool can_show_days = DISABLED(DOGM_SD_PERCENT) || ENABLED(ROTATE_PROGRESS_DISPLAY);
if (ev != lastElapsed) { if (ev != lastElapsed) {
lastElapsed = ev; lastElapsed = ev;
const bool has_days = (elapsed.value >= 60*60*24L); const uint8_t len = elapsed.toDigital(elapsed_string, can_show_days && elapsed.value >= 60*60*24L);
const uint8_t len = elapsed.toDigital(elapsed_string, has_days);
elapsed_x_pos = _SD_INFO_X(len); elapsed_x_pos = _SD_INFO_X(len);
#if ENABLED(SHOW_REMAINING_TIME) #if ENABLED(SHOW_REMAINING_TIME)
@ -468,8 +468,7 @@ void MarlinUI::draw_status_screen() {
} }
else { else {
duration_t estimation = timeval; duration_t estimation = timeval;
const bool has_days = (estimation.value >= 60*60*24L); const uint8_t len = estimation.toDigital(estimation_string, can_show_days && estimation.value >= 60*60*24L);
const uint8_t len = estimation.toDigital(estimation_string, has_days);
estimation_x_pos = _SD_INFO_X(len estimation_x_pos = _SD_INFO_X(len
#if !BOTH(DOGM_SD_PERCENT, ROTATE_PROGRESS_DISPLAY) #if !BOTH(DOGM_SD_PERCENT, ROTATE_PROGRESS_DISPLAY)
+ 1 + 1