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.

Sign up for GitHub

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
Merged

Implement Vertical GUI (Portrait Mode) #2273

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c159630
Implement Vertical GUI (for TFT24)
radry Nov 28, 2021
8db55ee
Merge branch 'master' of https://github.com/bigtreetech/BIGTREETECH-T…
radry Nov 28, 2021
a304e73
Fix Protrait Mode on Boot
radry Nov 28, 2021
4b5f1d1
Update menu.c
radry Nov 29, 2021
1a9ea3d
Update buildBinary.yml
radry Nov 29, 2021
dfa34f3
Update buildTest.yml
radry Nov 29, 2021
e90653f
Improved vertical GUI
radry Dec 5, 2021
066317c
Printing Menu Progressbar on top and Bugfixes
radry Dec 6, 2021
57f9166
Merge branch 'master' into master
radry Dec 9, 2021
0389b86
Update StatusScreen.c
radry Dec 9, 2021
ff7fc42
Merge branch 'master' of https://github.com/bigtreetech/BIGTREETECH-T…
radry Dec 11, 2021
66d6459
Merge branch 'master' of https://github.com/radry/BIGTREETECH-TouchSc…
radry Dec 11, 2021
50add1b
Fix
radry Dec 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion TFT/src/User/Menu/Move.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ void storeMoveCmd(AXIS xyz, int8_t direction)
void drawXYZ(void)
{
char tempstr[20];
GUI_SetColor(INFOBOX_ICON_COLOR);
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));
Expand Down
2 changes: 1 addition & 1 deletion TFT/src/User/Menu/StatusScreen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ void drawStatus(void)
GUI_SetTextMode(GUI_TEXTMODE_NORMAL);
GUI_SetColor(GANTRYLBL_COLOR);
GUI_SetBkColor(infoSettings.status_xyz_bg_color);
sprintf(tempstr, XYZ_STATUS, coordinateGetAxisActual(X_AXIS), coordinateGetAxisActual(Y_AXIS),
sprintf(tempstr, XYZ_STATUS, coordinateGetAxisActual(X_AXIS), coordinateGetAxisActual(Y_AXIS),
radry marked this conversation as resolved.
Show resolved Hide resolved
coordinateGetAxisActual(Z_AXIS));
GUI_DispStringInPrect(&RecGantry, (uint8_t *)tempstr);

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