The same changes to the axis-letters now for the char-displays
Exactly the same - copy/paste.
This commit is contained in:
parent
5b0f659355
commit
be24fdacea
1 changed files with 47 additions and 15 deletions
|
@ -615,29 +615,61 @@ static void lcd_implementation_status_screen() {
|
||||||
LCD_TEMP(degBed(), degTargetBed(), LCD_STR_BEDTEMP[0]);
|
LCD_TEMP(degBed(), degTargetBed(), LCD_STR_BEDTEMP[0]);
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
// Before homing the axis letters are blinking 'X' <-> '?'.
|
||||||
|
// When axis is homed but axis_known_position is false the axis letters are blinking 'X' <-> ' '.
|
||||||
|
// When everything is ok you see a constant 'X'.
|
||||||
|
|
||||||
|
if (blink & 1)
|
||||||
|
lcd_printPGM(PSTR("X"));
|
||||||
|
else {
|
||||||
|
if (!axis_homed[X_AXIS])
|
||||||
|
lcd_printPGM(PSTR("?"));
|
||||||
|
else
|
||||||
|
#if ENABLED(WARN_REDUCED_ACCURACY)
|
||||||
|
if (!axis_known_position[X_AXIS])
|
||||||
|
lcd_printPGM(PSTR(" "));
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
lcd_printPGM(PSTR("X"));
|
||||||
|
}
|
||||||
|
|
||||||
lcd.print('X');
|
|
||||||
if (axis_homed[X_AXIS] || (blink & 1))
|
|
||||||
lcd.print(ftostr4sign(current_position[X_AXIS]));
|
lcd.print(ftostr4sign(current_position[X_AXIS]));
|
||||||
else
|
|
||||||
lcd_printPGM(PSTR(" ---"));
|
|
||||||
|
|
||||||
lcd_printPGM(PSTR(" Y"));
|
lcd_printPGM(PSTR(" "));
|
||||||
if (axis_homed[Y_AXIS] || (blink & 1))
|
if (blink & 1)
|
||||||
lcd.print(ftostr4sign(current_position[Y_AXIS]));
|
lcd_printPGM(PSTR("Y"));
|
||||||
|
else {
|
||||||
|
if (!axis_homed[Y_AXIS])
|
||||||
|
lcd_printPGM(PSTR("?"));
|
||||||
else
|
else
|
||||||
lcd_printPGM(PSTR(" ---"));
|
#if ENABLED(WARN_REDUCED_ACCURACY)
|
||||||
|
if (!axis_known_position[Y_AXIS])
|
||||||
|
lcd_printPGM(PSTR(" "));
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
lcd_printPGM(PSTR("Y"));
|
||||||
|
}
|
||||||
|
lcd.print(ftostr4sign(current_position[Y_AXIS]));
|
||||||
|
|
||||||
#endif // EXTRUDERS > 1 || TEMP_SENSOR_BED != 0
|
#endif // EXTRUDERS > 1 || TEMP_SENSOR_BED != 0
|
||||||
|
|
||||||
#endif // LCD_WIDTH >= 20
|
#endif // LCD_WIDTH >= 20
|
||||||
|
|
||||||
lcd.setCursor(LCD_WIDTH - 8, 1);
|
lcd.setCursor(LCD_WIDTH - 8, 1);
|
||||||
lcd_printPGM(PSTR("Z "));
|
if (blink & 1)
|
||||||
if (axis_homed[Z_AXIS] || (blink & 1))
|
lcd_printPGM(PSTR("Z"));
|
||||||
lcd.print(ftostr32sp(current_position[Z_AXIS] + 0.00001));
|
else {
|
||||||
|
if (!axis_homed[Z_AXIS])
|
||||||
|
lcd_printPGM(PSTR("?"));
|
||||||
else
|
else
|
||||||
lcd_printPGM(PSTR("---.--"));
|
#if ENABLED(WARN_REDUCED_ACCURACY)
|
||||||
|
if (!axis_known_position[Z_AXIS])
|
||||||
|
lcd_printPGM(PSTR(" "));
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
lcd_printPGM(PSTR("Z"));
|
||||||
|
}
|
||||||
|
lcd.print(ftostr32sp(current_position[Z_AXIS] + 0.00001));
|
||||||
|
|
||||||
#endif // LCD_HEIGHT > 2
|
#endif // LCD_HEIGHT > 2
|
||||||
|
|
||||||
|
|
Reference in a new issue