|
|
@ -888,21 +888,21 @@ void CrealityDWINClass::Draw_Status_Area(bool icons/*=false*/) {
|
|
|
|
if ((update_x = axis_should_home(X_AXIS) && ui.get_blink()))
|
|
|
|
if ((update_x = axis_should_home(X_AXIS) && ui.get_blink()))
|
|
|
|
DWIN_Draw_String(true, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 35, 459, F(" -?- "));
|
|
|
|
DWIN_Draw_String(true, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 35, 459, F(" -?- "));
|
|
|
|
else
|
|
|
|
else
|
|
|
|
DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 3, 1, 35, 459, current_position.x * 10);
|
|
|
|
DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 3, 1, 35, 459, current_position.x);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (update_y) {
|
|
|
|
if (update_y) {
|
|
|
|
y = current_position.y;
|
|
|
|
y = current_position.y;
|
|
|
|
if ((update_y = axis_should_home(Y_AXIS) && ui.get_blink()))
|
|
|
|
if ((update_y = axis_should_home(Y_AXIS) && ui.get_blink()))
|
|
|
|
DWIN_Draw_String(true, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 120, 459, F(" -?- "));
|
|
|
|
DWIN_Draw_String(true, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 120, 459, F(" -?- "));
|
|
|
|
else
|
|
|
|
else
|
|
|
|
DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 3, 1, 120, 459, current_position.y * 10);
|
|
|
|
DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 3, 1, 120, 459, current_position.y);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (update_z) {
|
|
|
|
if (update_z) {
|
|
|
|
z = current_position.z;
|
|
|
|
z = current_position.z;
|
|
|
|
if ((update_z = axis_should_home(Z_AXIS) && ui.get_blink()))
|
|
|
|
if ((update_z = axis_should_home(Z_AXIS) && ui.get_blink()))
|
|
|
|
DWIN_Draw_String(true, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 205, 459, F(" -?- "));
|
|
|
|
DWIN_Draw_String(true, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 205, 459, F(" -?- "));
|
|
|
|
else
|
|
|
|
else
|
|
|
|
DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 3, 2, 205, 459, (current_position.z>=0) ? current_position.z * 100 : 0);
|
|
|
|
DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 3, 2, 205, 459, (current_position.z>=0) ? current_position.z : 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
DWIN_UpdateLCD();
|
|
|
|
DWIN_UpdateLCD();
|
|
|
|
}
|
|
|
|
}
|
|
|
|