|
@@ -580,11 +580,9 @@ static void lcd_implementation_status_screen() {
|
580
|
580
|
}
|
581
|
581
|
|
582
|
582
|
#if ENABLED(SDSUPPORT)
|
583
|
|
-
|
584
|
583
|
//
|
585
|
584
|
// SD Card Symbol
|
586
|
585
|
//
|
587
|
|
-
|
588
|
586
|
if (card.isFileOpen() && PAGE_CONTAINS(42 - (TALL_FONT_CORRECTION), 51 - (TALL_FONT_CORRECTION))) {
|
589
|
587
|
// Upper box
|
590
|
588
|
u8g.drawBox(42, 42 - (TALL_FONT_CORRECTION), 8, 7); // 42-48 (or 41-47)
|
|
@@ -595,11 +593,12 @@ static void lcd_implementation_status_screen() {
|
595
|
593
|
// Corner pixel
|
596
|
594
|
u8g.drawPixel(50, 43 - (TALL_FONT_CORRECTION)); // 43 (or 42)
|
597
|
595
|
}
|
|
596
|
+ #endif // SDSUPPORT
|
598
|
597
|
|
|
598
|
+ #if ENABLED(SDSUPPORT) || ENABLED(LCD_SET_PROGRESS_MANUALLY)
|
599
|
599
|
//
|
600
|
600
|
// Progress bar frame
|
601
|
601
|
//
|
602
|
|
-
|
603
|
602
|
#define PROGRESS_BAR_X 54
|
604
|
603
|
#define PROGRESS_BAR_WIDTH (LCD_PIXEL_WIDTH - PROGRESS_BAR_X)
|
605
|
604
|
|
|
@@ -650,7 +649,6 @@ static void lcd_implementation_status_screen() {
|
650
|
649
|
#endif
|
651
|
650
|
|
652
|
651
|
if (PAGE_CONTAINS(41, 48)) {
|
653
|
|
-
|
654
|
652
|
char buffer[10];
|
655
|
653
|
duration_t elapsed = print_job_timer.duration();
|
656
|
654
|
bool has_days = (elapsed.value >= 60*60*24L);
|
|
@@ -659,7 +657,7 @@ static void lcd_implementation_status_screen() {
|
659
|
657
|
lcd_print(buffer);
|
660
|
658
|
}
|
661
|
659
|
|
662
|
|
- #endif
|
|
660
|
+ #endif // SDSUPPORT || LCD_SET_PROGRESS_MANUALLY
|
663
|
661
|
|
664
|
662
|
//
|
665
|
663
|
// XYZ Coordinates
|