Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement Vertical GUI (Portrait Mode) #2273

Merged
merged 13 commits into from
Dec 14, 2021
2 changes: 1 addition & 1 deletion TFT/src/User/API/menu.c
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ void busyIndicator(SYS_STATUS status)
{
if (status == STATUS_BUSY)
{
GUI_SetColor(MENU_BUSY_DOT_COLOR);
GUI_SetColor(YELLOW);
radry marked this conversation as resolved.
Show resolved Hide resolved
GUI_FillCircle(busySign.rect.x0, (busySign.rect.y1 - busySign.rect.y0) / 2, (busySign.rect.x1-busySign.rect.x0) / 2);
GUI_SetColor(infoSettings.font_color);
}
Expand Down
9 changes: 5 additions & 4 deletions TFT/src/User/Menu/Move.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ void storeMoveCmd(AXIS xyz, int8_t direction)

void drawXYZ(void)
{
char tempstr[20];
GUI_SetColor(INFOBOX_ICON_COLOR);
#ifdef PORTRAIT
char tempstr[20];
radry marked this conversation as resolved.
Show resolved Hide resolved
GUI_SetColor(infoSettings.status_color);

#ifdef PORTRAIT
sprintf(tempstr, "X:%.2f Y:%.2f Z:%2.f", coordinateGetAxisActual(X_AXIS), coordinateGetAxisActual(Y_AXIS),
coordinateGetAxisActual(Z_AXIS));
GUI_DispString(START_X + 1 * SPACE_X + 1 * ICON_WIDTH, (ICON_START_Y - BYTE_HEIGHT) / 2, (uint8_t *)tempstr);
Expand All @@ -44,7 +45,7 @@ void drawXYZ(void)
sprintf(tempstr, "Z:%.2f ", coordinateGetAxisActual(Z_AXIS));
GUI_DispString(START_X + 3 * SPACE_X + 3 * ICON_WIDTH, (ICON_START_Y - BYTE_HEIGHT) / 2, (uint8_t *)tempstr);
#endif

radry marked this conversation as resolved.
Show resolved Hide resolved
GUI_SetColor(infoSettings.font_color);
}

Expand Down
7 changes: 3 additions & 4 deletions TFT/src/User/Menu/StatusScreen.c
Original file line number Diff line number Diff line change
Expand Up @@ -337,13 +337,12 @@ void drawStatus(void)
drawLiveText(3, &lvIcon, &SpeedItems[currentSpeedID]);
#endif

GUI_SetTextMode(GUI_TEXTMODE_NORMAL);
GUI_SetColor(GANTRYLBL_COLOR);
GUI_SetBkColor(infoSettings.status_xyz_bg_color);
GUI_SetTextMode(GUI_TEXTMODE_NORMAL);
radry marked this conversation as resolved.
Show resolved Hide resolved
radry marked this conversation as resolved.
Show resolved Hide resolved
GUI_SetColor(GANTRY_XYZ_FONT_COLOR);
GUI_SetBkColor(GANTRY_XYZ_BG_COLOR);
sprintf(tempstr, XYZ_STATUS, coordinateGetAxisActual(X_AXIS), coordinateGetAxisActual(Y_AXIS),
coordinateGetAxisActual(Z_AXIS));
GUI_DispStringInPrect(&RecGantry, (uint8_t *)tempstr);

GUI_RestoreColorDefault();
}

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.