Skip to content

Commit

Permalink
🐛 Fix TFT touch buttons, button colors (#25300)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexgrach authored and thinkyhead committed Apr 10, 2023
1 parent 1acfc48 commit 0cb2ced
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 17 deletions.
4 changes: 2 additions & 2 deletions Marlin/src/inc/Conditionals_LCD.h
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
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
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
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
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

0 comments on commit 0cb2ced

Please sign in to comment.