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

Update status_screen_DOGM.cpp

Browse Source
This commit is contained in:
Scott Lahteine 2019-10-24 13:42:02 -05:00 committed by GitHub
parent 326d5b84e7
commit ff4301a422
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -349,7 +349,7 @@ void MarlinUI::draw_status_screen() {
#if ENABLED(SHOW_REMAINING_TIME) #if ENABLED(SHOW_REMAINING_TIME)
static u8g_uint_t estimation_x_pos = 0; static u8g_uint_t estimation_x_pos = 0;
static char estimation_string[10]; static char estimation_string[10];
#if ENABLED(DOGM_SD_PERCENT) && ENABLED(ROTATE_PROGRESS_DISPLAY) #if BOTH(DOGM_SD_PERCENT, ROTATE_PROGRESS_DISPLAY)
#define PROGRESS_TIME_PREFIX "PROG" #define PROGRESS_TIME_PREFIX "PROG"
#define ELAPSED_TIME_PREFIX "ELAP" #define ELAPSED_TIME_PREFIX "ELAP"
#define SHOW_REMAINING_TIME_PREFIX "REM" #define SHOW_REMAINING_TIME_PREFIX "REM"
@ -419,8 +419,8 @@ void MarlinUI::draw_status_screen() {
#endif #endif
)); ));
} }
#if ENABLED(SHOW_REMAINING_TIME) && ENABLED(ROTATE_PROGRESS_DISPLAY) // Tristate progress display mode #if BOTH(SHOW_REMAINING_TIME, ROTATE_PROGRESS_DISPLAY) // Tri-state progress display mode
progress_x_pos = _SD_DURATION_X(strlen(progress_string)+1); progress_x_pos = _SD_DURATION_X(strlen(progress_string) + 1);
#endif #endif
#endif #endif
} }
@ -441,7 +441,7 @@ void MarlinUI::draw_status_screen() {
else { else {
const bool has_days = (estimation.value >= 60*60*24L); 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, has_days);
#if ENABLED(DOGM_SD_PERCENT) && ENABLED(ROTATE_PROGRESS_DISPLAY) #if BOTH(DOGM_SD_PERCENT, ROTATE_PROGRESS_DISPLAY)
estimation_x_pos = _SD_DURATION_X(len); estimation_x_pos = _SD_DURATION_X(len);
#else #else
estimation_x_pos = _SD_DURATION_X(len + 1); estimation_x_pos = _SD_DURATION_X(len + 1);