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

improved Terminal menu #1227

Merged
merged 8 commits into from
Nov 4, 2020
Merged

improved Terminal menu #1227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
83cdab1
improved Terminal menu
digant73 Nov 2, 2020
165b9c3
minor change
digant73 Nov 2, 2020
66325bd
minor changes
digant73 Nov 2, 2020
fa45047
minor cleanup
digant73 Nov 2, 2020
2513cf3
reduced blue color saturation
digant73 Nov 2, 2020
2c1f14a
cleanup
digant73 Nov 3, 2020
d235b34
sync
Msq001 Nov 4, 2020
f59ee8c
tweak ui
Msq001 Nov 4, 2020
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
4 changes: 0 additions & 4 deletions TFT/src/User/API/UI/ui_draw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ extern "C" {
#define SSICON_SECOND ROW
#endif

/*about GCODE KEY*/
#define GKEY_WIDTH (LCD_WIDTH/6)
#define GKEY_HEIGHT ((LCD_HEIGHT - ICON_START_Y)/4)

//select marlin or bigtree
#define SPACE_SELEX ((LCD_WIDTH-ICON_WIDTH*2)/4)
#define SPACE_SELEY ((LCD_HEIGHT-ICON_HEIGHT)/2)
Expand Down
2 changes: 1 addition & 1 deletion TFT/src/User/Hal/stm32f10x/sdio_sdcard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ extern SD_CardInfo SDCardInfo;//SD card information

//SDIO related parameter definition
#ifndef NULL
#define NULL 0
#define NULL 0
#endif
#define SDIO_STATIC_FLAGS ((u32)0x000005FF)
#define SDIO_CMD0TIMEOUT ((u32)0x00010000)
Expand Down
Loading