|
@@ -104,6 +104,7 @@
|
104
|
104
|
#endif
|
105
|
105
|
|
106
|
106
|
#define PROGRESS_BAR_X 54
|
|
107
|
+#define PROGRESS_BAR_Y (EXTRAS_BASELINE + 2)
|
107
|
108
|
#define PROGRESS_BAR_WIDTH (LCD_PIXEL_WIDTH - PROGRESS_BAR_X)
|
108
|
109
|
|
109
|
110
|
FORCE_INLINE void _draw_centered_temp(const int16_t temp, const uint8_t tx, const uint8_t ty) {
|
|
@@ -597,7 +598,7 @@ void MarlinUI::draw_status_screen() {
|
597
|
598
|
//
|
598
|
599
|
|
599
|
600
|
if (PAGE_CONTAINS(49, 52))
|
600
|
|
- u8g.drawFrame(PROGRESS_BAR_X, 49, PROGRESS_BAR_WIDTH, 4);
|
|
601
|
+ u8g.drawFrame(PROGRESS_BAR_X, PROGRESS_BAR_Y, PROGRESS_BAR_WIDTH, 4);
|
601
|
602
|
|
602
|
603
|
//
|
603
|
604
|
// Progress bar solid part
|
|
@@ -638,7 +639,7 @@ void MarlinUI::draw_status_screen() {
|
638
|
639
|
|
639
|
640
|
#if ENABLED(DOGM_SD_PERCENT)
|
640
|
641
|
if (progress_string[0]) {
|
641
|
|
- lcd_put_u8str(55, 48, progress_string); // Percent complete
|
|
642
|
+ lcd_put_u8str(55, EXTRAS_BASELINE, progress_string); // Percent complete
|
642
|
643
|
lcd_put_wchar('%');
|
643
|
644
|
}
|
644
|
645
|
#endif
|
|
@@ -665,7 +666,7 @@ void MarlinUI::draw_status_screen() {
|
665
|
666
|
// XYZ Coordinates
|
666
|
667
|
//
|
667
|
668
|
|
668
|
|
- #if ENABLED(XYZ_HOLLOW_FRAME)
|
|
669
|
+ #if EITHER(XYZ_NO_FRAME, XYZ_HOLLOW_FRAME)
|
669
|
670
|
#define XYZ_FRAME_TOP 29
|
670
|
671
|
#define XYZ_FRAME_HEIGHT INFO_FONT_ASCENT + 3
|
671
|
672
|
#else
|
|
@@ -675,15 +676,17 @@ void MarlinUI::draw_status_screen() {
|
675
|
676
|
|
676
|
677
|
if (PAGE_CONTAINS(XYZ_FRAME_TOP, XYZ_FRAME_TOP + XYZ_FRAME_HEIGHT - 1)) {
|
677
|
678
|
|
678
|
|
- #if ENABLED(XYZ_HOLLOW_FRAME)
|
679
|
|
- u8g.drawFrame(0, XYZ_FRAME_TOP, LCD_PIXEL_WIDTH, XYZ_FRAME_HEIGHT); // 8: 29-40 7: 29-39
|
680
|
|
- #else
|
681
|
|
- u8g.drawBox(0, XYZ_FRAME_TOP, LCD_PIXEL_WIDTH, XYZ_FRAME_HEIGHT); // 8: 30-39 7: 30-37
|
|
679
|
+ #if DISABLED(XYZ_NO_FRAME)
|
|
680
|
+ #if ENABLED(XYZ_HOLLOW_FRAME)
|
|
681
|
+ u8g.drawFrame(0, XYZ_FRAME_TOP, LCD_PIXEL_WIDTH, XYZ_FRAME_HEIGHT); // 8: 29-40 7: 29-39
|
|
682
|
+ #else
|
|
683
|
+ u8g.drawBox(0, XYZ_FRAME_TOP, LCD_PIXEL_WIDTH, XYZ_FRAME_HEIGHT); // 8: 30-39 7: 30-37
|
|
684
|
+ #endif
|
682
|
685
|
#endif
|
683
|
686
|
|
684
|
687
|
if (PAGE_CONTAINS(XYZ_BASELINE - (INFO_FONT_ASCENT - 1), XYZ_BASELINE)) {
|
685
|
688
|
|
686
|
|
- #if DISABLED(XYZ_HOLLOW_FRAME)
|
|
689
|
+ #if NONE(XYZ_NO_FRAME, XYZ_HOLLOW_FRAME)
|
687
|
690
|
u8g.setColorIndex(0); // white on black
|
688
|
691
|
#endif
|
689
|
692
|
|
|
@@ -722,7 +725,7 @@ void MarlinUI::draw_status_screen() {
|
722
|
725
|
|
723
|
726
|
_draw_axis_value(Z_AXIS, zstring, blink);
|
724
|
727
|
|
725
|
|
- #if DISABLED(XYZ_HOLLOW_FRAME)
|
|
728
|
+ #if NONE(XYZ_NO_FRAME, XYZ_HOLLOW_FRAME)
|
726
|
729
|
u8g.setColorIndex(1); // black on white
|
727
|
730
|
#endif
|
728
|
731
|
}
|
|
@@ -770,10 +773,11 @@ void MarlinUI::draw_status_screen() {
|
770
|
773
|
lcd_put_wchar(':');
|
771
|
774
|
lcd_put_u8str(mstring);
|
772
|
775
|
lcd_put_wchar('%');
|
|
776
|
+ return;
|
773
|
777
|
}
|
774
|
|
- else
|
775
|
778
|
#endif
|
776
|
|
- draw_status_message(blink);
|
|
779
|
+
|
|
780
|
+ draw_status_message(blink);
|
777
|
781
|
}
|
778
|
782
|
}
|
779
|
783
|
|