|
@ -98,19 +98,24 @@ FORCE_INLINE void _draw_heater_status(const uint8_t x, const int8_t heater, cons |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
FORCE_INLINE void _draw_axis_label(const AxisEnum axis, const char* const pstr, const bool blink) { |
|
|
//
|
|
|
|
|
|
// Before homing, blink '123' <-> '???'.
|
|
|
|
|
|
// Homed but unknown... '123' <-> ' '.
|
|
|
|
|
|
// Homed and known, display constantly.
|
|
|
|
|
|
//
|
|
|
|
|
|
FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const bool blink) { |
|
|
if (blink) |
|
|
if (blink) |
|
|
lcd_put_u8str_rom(pstr); |
|
|
lcd_put_u8str(value); |
|
|
else { |
|
|
else { |
|
|
if (!axis_homed[axis]) |
|
|
if (!axis_homed[axis]) |
|
|
lcd_put_wchar('?'); |
|
|
while (const char c = *value++) lcd_put_wchar(c <= '.' ? c : '?'); |
|
|
else { |
|
|
else { |
|
|
#if DISABLED(HOME_AFTER_DEACTIVATE) && DISABLED(DISABLE_REDUCED_ACCURACY_WARNING) |
|
|
#if DISABLED(HOME_AFTER_DEACTIVATE) && DISABLED(DISABLE_REDUCED_ACCURACY_WARNING) |
|
|
if (!axis_known_position[axis]) |
|
|
if (!axis_known_position[axis]) |
|
|
lcd_put_wchar(' '); |
|
|
lcd_put_u8str_rom(axis == Z_AXIS ? PSTR(" ") : PSTR(" ")); |
|
|
else |
|
|
else |
|
|
#endif |
|
|
#endif |
|
|
lcd_put_u8str_rom(pstr); |
|
|
lcd_put_u8str(value); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
@ -330,10 +335,6 @@ static void lcd_implementation_status_screen() { |
|
|
#define XYZ_FRAME_HEIGHT INFO_FONT_HEIGHT + 1 |
|
|
#define XYZ_FRAME_HEIGHT INFO_FONT_HEIGHT + 1 |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
// 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'.
|
|
|
|
|
|
|
|
|
|
|
|
static char xstring[5], ystring[5], zstring[7]; |
|
|
static char xstring[5], ystring[5], zstring[7]; |
|
|
#if ENABLED(FILAMENT_LCD_DISPLAY) |
|
|
#if ENABLED(FILAMENT_LCD_DISPLAY) |
|
|
static char wstring[5], mstring[4]; |
|
|
static char wstring[5], mstring[4]; |
|
@ -370,19 +371,19 @@ static void lcd_implementation_status_screen() { |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
lcd_moveto(0 * XYZ_SPACING + X_LABEL_POS, XYZ_BASELINE); |
|
|
lcd_moveto(0 * XYZ_SPACING + X_LABEL_POS, XYZ_BASELINE); |
|
|
_draw_axis_label(X_AXIS, PSTR(MSG_X), blink); |
|
|
lcd_put_wchar('X'); |
|
|
lcd_moveto(0 * XYZ_SPACING + X_VALUE_POS, XYZ_BASELINE); |
|
|
lcd_moveto(0 * XYZ_SPACING + X_VALUE_POS, XYZ_BASELINE); |
|
|
lcd_put_u8str(xstring); |
|
|
_draw_axis_value(X_AXIS, xstring, blink); |
|
|
|
|
|
|
|
|
lcd_moveto(1 * XYZ_SPACING + X_LABEL_POS, XYZ_BASELINE); |
|
|
lcd_moveto(1 * XYZ_SPACING + X_LABEL_POS, XYZ_BASELINE); |
|
|
_draw_axis_label(Y_AXIS, PSTR(MSG_Y), blink); |
|
|
lcd_put_wchar('Y'); |
|
|
lcd_moveto(1 * XYZ_SPACING + X_VALUE_POS, XYZ_BASELINE); |
|
|
lcd_moveto(1 * XYZ_SPACING + X_VALUE_POS, XYZ_BASELINE); |
|
|
lcd_put_u8str(ystring); |
|
|
_draw_axis_value(Y_AXIS, ystring, blink); |
|
|
|
|
|
|
|
|
lcd_moveto(2 * XYZ_SPACING + X_LABEL_POS, XYZ_BASELINE); |
|
|
lcd_moveto(2 * XYZ_SPACING + X_LABEL_POS, XYZ_BASELINE); |
|
|
_draw_axis_label(Z_AXIS, PSTR(MSG_Z), blink); |
|
|
lcd_put_wchar('Z'); |
|
|
lcd_moveto(2 * XYZ_SPACING + X_VALUE_POS, XYZ_BASELINE); |
|
|
lcd_moveto(2 * XYZ_SPACING + X_VALUE_POS, XYZ_BASELINE); |
|
|
lcd_put_u8str(zstring); |
|
|
_draw_axis_value(Z_AXIS, zstring, blink); |
|
|
|
|
|
|
|
|
#if DISABLED(XYZ_HOLLOW_FRAME) |
|
|
#if DISABLED(XYZ_HOLLOW_FRAME) |
|
|
u8g.setColorIndex(1); // black on white
|
|
|
u8g.setColorIndex(1); // black on white
|
|
|