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

Jump to bottom

Buttons colors, Conditionals_LCD.h #25300

Merged
merged 4 commits into from
Feb 1, 2023
Merged

Buttons colors, Conditionals_LCD.h #25300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8530f39
Moved buttons colors to tft_color.h
alexgrach Jan 26, 2023
e9de80f
Merge branch 'MarlinFirmware:bugfix-2.1.x' into bugfix-2.1.x
alexgrach Jan 27, 2023
36b5816
Update Conditionals_LCD.h
alexgrach Jan 27, 2023
a94ec84
Merge branch 'MarlinFirmware:bugfix-2.1.x' into bugfix-2.1.x
alexgrach Jan 31, 2023
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: 2 additions & 2 deletions Marlin/src/inc/Conditionals_LCD.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1611,9 +1611,9 @@
#endif
#if ANY(HAS_UI_320x240, HAS_UI_480x320, HAS_UI_480x272)
#if ENABLED(TFT_COLOR_UI_PORTRAIT)
#define LCD_HEIGHT TERN(TOUCH_SCREEN, 6, 7) // Fewer lines with touch buttons onscreen
#else
#define LCD_HEIGHT TERN(TOUCH_SCREEN, 8, 9) // Fewer lines with touch buttons onscreen
#else
#define LCD_HEIGHT TERN(TOUCH_SCREEN, 6, 7) // Fewer lines with touch buttons onscreen
#endif
#elif HAS_UI_1024x600
#define LCD_HEIGHT TERN(TOUCH_SCREEN, 12, 13) // Fewer lines with touch buttons onscreen
Expand Down
13 changes: 13 additions & 0 deletions Marlin/src/lcd/tft/tft_color.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,3 +178,16 @@
#ifndef COLOR_KILL_SCREEN_TEXT
#define COLOR_KILL_SCREEN_TEXT COLOR_WHITE
#endif

#ifndef E_BTN_COLOR
#define E_BTN_COLOR COLOR_YELLOW
#endif
#ifndef X_BTN_COLOR
#define X_BTN_COLOR COLOR_CORAL_RED
#endif
#ifndef Y_BTN_COLOR
#define Y_BTN_COLOR COLOR_VIVID_GREEN
#endif
#ifndef Z_BTN_COLOR
#define Z_BTN_COLOR COLOR_LIGHT_BLUE
#endif
5 changes: 0 additions & 5 deletions Marlin/src/lcd/tft/ui_1024x600.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,11 +592,6 @@ struct MotionAxisState {

MotionAxisState motionAxisState;

#define E_BTN_COLOR COLOR_YELLOW
#define X_BTN_COLOR COLOR_CORAL_RED
#define Y_BTN_COLOR COLOR_VIVID_GREEN
#define Z_BTN_COLOR COLOR_LIGHT_BLUE

#define BTN_WIDTH 64
#define BTN_HEIGHT 52
#define X_MARGIN 20
Expand Down
5 changes: 0 additions & 5 deletions Marlin/src/lcd/tft/ui_320x240.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,11 +674,6 @@ struct MotionAxisState {

MotionAxisState motionAxisState;

#define E_BTN_COLOR COLOR_YELLOW
#define X_BTN_COLOR COLOR_CORAL_RED
#define Y_BTN_COLOR COLOR_VIVID_GREEN
#define Z_BTN_COLOR COLOR_LIGHT_BLUE

#define BTN_WIDTH 48
#define BTN_HEIGHT 39
#define X_MARGIN 15
Expand Down
5 changes: 0 additions & 5 deletions Marlin/src/lcd/tft/ui_480x320.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,11 +573,6 @@ struct MotionAxisState {

MotionAxisState motionAxisState;

#define E_BTN_COLOR COLOR_YELLOW
#define X_BTN_COLOR COLOR_CORAL_RED
#define Y_BTN_COLOR COLOR_VIVID_GREEN
#define Z_BTN_COLOR COLOR_LIGHT_BLUE

#define BTN_WIDTH 64
#define BTN_HEIGHT 52
#define X_MARGIN 20
Expand Down