Quellcode durchsuchen

Update status_screen_DOGM.cpp

Scott Lahteine vor 5 Jahren
Ursprung
Commit
ff4301a422
Es ist kein Account mit der E-Mail-Adresse des Committers verbunden
1 geänderte Dateien mit 4 neuen und 4 gelöschten Zeilen
  1. 4
    4
      Marlin/src/lcd/dogm/status_screen_DOGM.cpp

+ 4
- 4
Marlin/src/lcd/dogm/status_screen_DOGM.cpp Datei anzeigen

@@ -349,7 +349,7 @@ void MarlinUI::draw_status_screen() {
349 349
     #if ENABLED(SHOW_REMAINING_TIME)
350 350
       static u8g_uint_t estimation_x_pos = 0;
351 351
       static char estimation_string[10];
352
-      #if ENABLED(DOGM_SD_PERCENT) && ENABLED(ROTATE_PROGRESS_DISPLAY)
352
+      #if BOTH(DOGM_SD_PERCENT, ROTATE_PROGRESS_DISPLAY)
353 353
         #define PROGRESS_TIME_PREFIX "PROG"
354 354
         #define ELAPSED_TIME_PREFIX "ELAP"
355 355
         #define SHOW_REMAINING_TIME_PREFIX "REM"
@@ -419,8 +419,8 @@ void MarlinUI::draw_status_screen() {
419 419
               #endif
420 420
             ));
421 421
           }
422
-          #if ENABLED(SHOW_REMAINING_TIME)  && ENABLED(ROTATE_PROGRESS_DISPLAY) // Tristate progress display mode
423
-            progress_x_pos = _SD_DURATION_X(strlen(progress_string)+1);
422
+          #if BOTH(SHOW_REMAINING_TIME, ROTATE_PROGRESS_DISPLAY) // Tri-state progress display mode
423
+            progress_x_pos = _SD_DURATION_X(strlen(progress_string) + 1);
424 424
           #endif
425 425
         #endif
426 426
       }
@@ -441,7 +441,7 @@ void MarlinUI::draw_status_screen() {
441 441
             else {
442 442
               const bool has_days = (estimation.value >= 60*60*24L);
443 443
               const uint8_t len = estimation.toDigital(estimation_string, has_days);
444
-              #if ENABLED(DOGM_SD_PERCENT) && ENABLED(ROTATE_PROGRESS_DISPLAY)
444
+              #if BOTH(DOGM_SD_PERCENT, ROTATE_PROGRESS_DISPLAY)
445 445
                 estimation_x_pos = _SD_DURATION_X(len);
446 446
               #else
447 447
                 estimation_x_pos = _SD_DURATION_X(len + 1);

Laden…
Abbrechen
Speichern