zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

📺 Fix TFT Classic UI non-Touchscreen 1024x600 (#24541)

Browse source
This commit is contained in:
Keith Bennett 2022-07-25 12:02:37 -07:00 committed by Scott Lahteine
parent cdda90f56c
commit c847ef02a1
5 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1386,8 +1386,13 @@
#elif ENABLED(TFT_RES_1024x600) #elif ENABLED(TFT_RES_1024x600)
#define TFT_WIDTH 1024 #define TFT_WIDTH 1024
#define TFT_HEIGHT 600 #define TFT_HEIGHT 600
#define GRAPHICAL_TFT_UPSCALE 6 #if ENABLED(TOUCH_SCREEN)
#define TFT_PIXEL_OFFSET_X 120 #define GRAPHICAL_TFT_UPSCALE 6
#define TFT_PIXEL_OFFSET_X 120
#else
#define GRAPHICAL_TFT_UPSCALE 8
#define TFT_PIXEL_OFFSET_X 0
#endif
#endif #endif
// FSMC/SPI TFT Panels using standard HAL/tft/tft_(fsmc|spi|ltdc).h // FSMC/SPI TFT Panels using standard HAL/tft/tft_(fsmc|spi|ltdc).h

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

@ -2841,8 +2841,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#endif #endif
#endif #endif
#if defined(GRAPHICAL_TFT_UPSCALE) && !WITHIN(GRAPHICAL_TFT_UPSCALE, 2, 6) #if defined(GRAPHICAL_TFT_UPSCALE) && !WITHIN(GRAPHICAL_TFT_UPSCALE, 2, 8)
#error "GRAPHICAL_TFT_UPSCALE must be between 2 and 6." #error "GRAPHICAL_TFT_UPSCALE must be between 2 and 8."
#endif #endif
#if BOTH(CHIRON_TFT_STANDARD, CHIRON_TFT_NEW) #if BOTH(CHIRON_TFT_STANDARD, CHIRON_TFT_NEW)

2
Marlin/src/lcd/tft/ui_1024x600.cpp
View file

@ -791,7 +791,7 @@ static void z_minus() { moveAxis(Z_AXIS, -1); }
} }
#endif #endif
#if HAS_BED_PROBE #if BOTH(HAS_BED_PROBE, TOUCH_SCREEN)
static void z_select() { static void z_select() {
motionAxisState.z_selection *= -1; motionAxisState.z_selection *= -1;
quick_feedback(); quick_feedback();

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

@ -771,7 +771,7 @@ static void z_minus() { moveAxis(Z_AXIS, -1); }
} }
#endif #endif
#if HAS_BED_PROBE #if BOTH(HAS_BED_PROBE, TOUCH_SCREEN)
static void z_select() { static void z_select() {
motionAxisState.z_selection *= -1; motionAxisState.z_selection *= -1;
quick_feedback(); quick_feedback();

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

@ -772,7 +772,7 @@ static void z_minus() { moveAxis(Z_AXIS, -1); }
} }
#endif #endif
#if HAS_BED_PROBE #if BOTH(HAS_BED_PROBE, TOUCH_SCREEN)
static void z_select() { static void z_select() {
motionAxisState.z_selection *= -1; motionAxisState.z_selection *= -1;
quick_feedback(); quick_feedback();