From ff4301a422b081cee26e32e2ef0067ee5e834563 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 24 Oct 2019 13:42:02 -0500 Subject: [PATCH] Update status_screen_DOGM.cpp --- Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp index 2fa6f2fad7..f9a17280db 100644 --- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp +++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp @@ -349,7 +349,7 @@ void MarlinUI::draw_status_screen() { #if ENABLED(SHOW_REMAINING_TIME) static u8g_uint_t estimation_x_pos = 0; 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 ELAPSED_TIME_PREFIX "ELAP" #define SHOW_REMAINING_TIME_PREFIX "REM" @@ -419,8 +419,8 @@ void MarlinUI::draw_status_screen() { #endif )); } - #if ENABLED(SHOW_REMAINING_TIME) && ENABLED(ROTATE_PROGRESS_DISPLAY) // Tristate progress display mode - progress_x_pos = _SD_DURATION_X(strlen(progress_string)+1); + #if BOTH(SHOW_REMAINING_TIME, ROTATE_PROGRESS_DISPLAY) // Tri-state progress display mode + progress_x_pos = _SD_DURATION_X(strlen(progress_string) + 1); #endif #endif } @@ -441,7 +441,7 @@ void MarlinUI::draw_status_screen() { else { const bool has_days = (estimation.value >= 60*60*24L); 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); #else estimation_x_pos = _SD_DURATION_X(len + 1);