Skip to content

Commit 976ac28

Browse files
thisiskeithbthinkyhead
authored andcommitted
📺 Fix TFT Classic UI non-Touchscreen 1024x600 (#24541)
1 parent b0b340a commit 976ac28

File tree

5 files changed

+12
-7
lines changed

5 files changed

+12
-7
lines changed

Marlin/src/inc/Conditionals_LCD.h

+7-2
Original file line numberDiff line numberDiff line change
@@ -1386,8 +1386,13 @@
13861386
#elif ENABLED(TFT_RES_1024x600)
13871387
#define TFT_WIDTH 1024
13881388
#define TFT_HEIGHT 600
1389-
#define GRAPHICAL_TFT_UPSCALE 6
1390-
#define TFT_PIXEL_OFFSET_X 120
1389+
#if ENABLED(TOUCH_SCREEN)
1390+
#define GRAPHICAL_TFT_UPSCALE 6
1391+
#define TFT_PIXEL_OFFSET_X 120
1392+
#else
1393+
#define GRAPHICAL_TFT_UPSCALE 8
1394+
#define TFT_PIXEL_OFFSET_X 0
1395+
#endif
13911396
#endif
13921397

13931398
// FSMC/SPI TFT Panels using standard HAL/tft/tft_(fsmc|spi|ltdc).h

Marlin/src/inc/SanityCheck.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -2841,8 +2841,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
28412841
#endif
28422842
#endif
28432843

2844-
#if defined(GRAPHICAL_TFT_UPSCALE) && !WITHIN(GRAPHICAL_TFT_UPSCALE, 2, 6)
2845-
#error "GRAPHICAL_TFT_UPSCALE must be between 2 and 6."
2844+
#if defined(GRAPHICAL_TFT_UPSCALE) && !WITHIN(GRAPHICAL_TFT_UPSCALE, 2, 8)
2845+
#error "GRAPHICAL_TFT_UPSCALE must be between 2 and 8."
28462846
#endif
28472847

28482848
#if BOTH(CHIRON_TFT_STANDARD, CHIRON_TFT_NEW)

Marlin/src/lcd/tft/ui_1024x600.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ static void z_minus() { moveAxis(Z_AXIS, -1); }
791791
}
792792
#endif
793793

794-
#if HAS_BED_PROBE
794+
#if BOTH(HAS_BED_PROBE, TOUCH_SCREEN)
795795
static void z_select() {
796796
motionAxisState.z_selection *= -1;
797797
quick_feedback();

Marlin/src/lcd/tft/ui_320x240.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ static void z_minus() { moveAxis(Z_AXIS, -1); }
771771
}
772772
#endif
773773

774-
#if HAS_BED_PROBE
774+
#if BOTH(HAS_BED_PROBE, TOUCH_SCREEN)
775775
static void z_select() {
776776
motionAxisState.z_selection *= -1;
777777
quick_feedback();

Marlin/src/lcd/tft/ui_480x320.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ static void z_minus() { moveAxis(Z_AXIS, -1); }
772772
}
773773
#endif
774774

775-
#if HAS_BED_PROBE
775+
#if BOTH(HAS_BED_PROBE, TOUCH_SCREEN)
776776
static void z_select() {
777777
motionAxisState.z_selection *= -1;
778778
quick_feedback();

0 commit comments

Comments
 (0)