3DPrinting/MarlinFirmware
0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-03-29 01:19:07 +00:00
Code Issues Releases Wiki Activity

🐛 Fix TFT touch buttons, button colors ()

Browse source
This commit is contained in:
alexgrach 2023-02-01 10:40:13 +03:00 • committed by GitHub
parent d6f4f24658
commit fbe9237a6c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 17 deletions

4
Marlin/src/inc/Conditionals_LCD.h
View file

@ -1611,9 +1611,9 @@
#endif #endif
#if ANY(HAS_UI_320x240, HAS_UI_480x320, HAS_UI_480x272) #if ANY(HAS_UI_320x240, HAS_UI_480x320, HAS_UI_480x272)
#if ENABLED(TFT_COLOR_UI_PORTRAIT) #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 #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 #endif
#elif HAS_UI_1024x600 #elif HAS_UI_1024x600
#define LCD_HEIGHT TERN(TOUCH_SCREEN, 12, 13) // Fewer lines with touch buttons onscreen #define LCD_HEIGHT TERN(TOUCH_SCREEN, 12, 13) // Fewer lines with touch buttons onscreen

13
Marlin/src/lcd/tft/tft_color.h
View file

@ -178,3 +178,16 @@
#ifndef COLOR_KILL_SCREEN_TEXT #ifndef COLOR_KILL_SCREEN_TEXT
#define COLOR_KILL_SCREEN_TEXT COLOR_WHITE #define COLOR_KILL_SCREEN_TEXT COLOR_WHITE
#endif #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
Marlin/src/lcd/tft/ui_1024x600.cpp
View file

@ -592,11 +592,6 @@ struct MotionAxisState {
MotionAxisState 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_WIDTH 64
#define BTN_HEIGHT 52 #define BTN_HEIGHT 52
#define X_MARGIN 20 #define X_MARGIN 20

5
Marlin/src/lcd/tft/ui_320x240.cpp
View file

@ -674,11 +674,6 @@ struct MotionAxisState {
MotionAxisState 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_WIDTH 48
#define BTN_HEIGHT 39 #define BTN_HEIGHT 39
#define X_MARGIN 15 #define X_MARGIN 15

5
Marlin/src/lcd/tft/ui_480x320.cpp
View file

@ -573,11 +573,6 @@ struct MotionAxisState {
MotionAxisState 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_WIDTH 64
#define BTN_HEIGHT 52 #define BTN_HEIGHT 52
#define X_MARGIN 20 #define X_MARGIN 20