|
@@ -615,29 +615,61 @@ static void lcd_implementation_status_screen() {
|
615
|
615
|
LCD_TEMP(degBed(), degTargetBed(), LCD_STR_BEDTEMP[0]);
|
616
|
616
|
|
617
|
617
|
#else
|
|
618
|
+ // Before homing the axis letters are blinking 'X' <-> '?'.
|
|
619
|
+ // When axis is homed but axis_known_position is false the axis letters are blinking 'X' <-> ' '.
|
|
620
|
+ // When everything is ok you see a constant 'X'.
|
|
621
|
+
|
|
622
|
+ if (blink & 1)
|
|
623
|
+ lcd_printPGM(PSTR("X"));
|
|
624
|
+ else {
|
|
625
|
+ if (!axis_homed[X_AXIS])
|
|
626
|
+ lcd_printPGM(PSTR("?"));
|
|
627
|
+ else
|
|
628
|
+ #if ENABLED(WARN_REDUCED_ACCURACY)
|
|
629
|
+ if (!axis_known_position[X_AXIS])
|
|
630
|
+ lcd_printPGM(PSTR(" "));
|
|
631
|
+ else
|
|
632
|
+ #endif
|
|
633
|
+ lcd_printPGM(PSTR("X"));
|
|
634
|
+ }
|
618
|
635
|
|
619
|
|
- lcd.print('X');
|
620
|
|
- if (axis_homed[X_AXIS] || (blink & 1))
|
621
|
|
- lcd.print(ftostr4sign(current_position[X_AXIS]));
|
622
|
|
- else
|
623
|
|
- lcd_printPGM(PSTR(" ---"));
|
624
|
|
-
|
625
|
|
- lcd_printPGM(PSTR(" Y"));
|
626
|
|
- if (axis_homed[Y_AXIS] || (blink & 1))
|
627
|
|
- lcd.print(ftostr4sign(current_position[Y_AXIS]));
|
628
|
|
- else
|
629
|
|
- lcd_printPGM(PSTR(" ---"));
|
|
636
|
+ lcd.print(ftostr4sign(current_position[X_AXIS]));
|
|
637
|
+
|
|
638
|
+ lcd_printPGM(PSTR(" "));
|
|
639
|
+ if (blink & 1)
|
|
640
|
+ lcd_printPGM(PSTR("Y"));
|
|
641
|
+ else {
|
|
642
|
+ if (!axis_homed[Y_AXIS])
|
|
643
|
+ lcd_printPGM(PSTR("?"));
|
|
644
|
+ else
|
|
645
|
+ #if ENABLED(WARN_REDUCED_ACCURACY)
|
|
646
|
+ if (!axis_known_position[Y_AXIS])
|
|
647
|
+ lcd_printPGM(PSTR(" "));
|
|
648
|
+ else
|
|
649
|
+ #endif
|
|
650
|
+ lcd_printPGM(PSTR("Y"));
|
|
651
|
+ }
|
|
652
|
+ lcd.print(ftostr4sign(current_position[Y_AXIS]));
|
630
|
653
|
|
631
|
654
|
#endif // EXTRUDERS > 1 || TEMP_SENSOR_BED != 0
|
632
|
655
|
|
633
|
656
|
#endif // LCD_WIDTH >= 20
|
634
|
657
|
|
635
|
658
|
lcd.setCursor(LCD_WIDTH - 8, 1);
|
636
|
|
- lcd_printPGM(PSTR("Z "));
|
637
|
|
- if (axis_homed[Z_AXIS] || (blink & 1))
|
638
|
|
- lcd.print(ftostr32sp(current_position[Z_AXIS] + 0.00001));
|
639
|
|
- else
|
640
|
|
- lcd_printPGM(PSTR("---.--"));
|
|
659
|
+ if (blink & 1)
|
|
660
|
+ lcd_printPGM(PSTR("Z"));
|
|
661
|
+ else {
|
|
662
|
+ if (!axis_homed[Z_AXIS])
|
|
663
|
+ lcd_printPGM(PSTR("?"));
|
|
664
|
+ else
|
|
665
|
+ #if ENABLED(WARN_REDUCED_ACCURACY)
|
|
666
|
+ if (!axis_known_position[Z_AXIS])
|
|
667
|
+ lcd_printPGM(PSTR(" "));
|
|
668
|
+ else
|
|
669
|
+ #endif
|
|
670
|
+ lcd_printPGM(PSTR("Z"));
|
|
671
|
+ }
|
|
672
|
+ lcd.print(ftostr32sp(current_position[Z_AXIS] + 0.00001));
|
641
|
673
|
|
642
|
674
|
#endif // LCD_HEIGHT > 2
|
643
|
675
|
|