Pārlūkot izejas kodu

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

Keith Bennett 2 gadus atpakaļ
vecāks
revīzija
4ffa2e80e4
Revīzijas autora e-pasta adrese nav piesaistīta nevienam kontam

+ 7
- 2
Marlin/src/inc/Conditionals_LCD.h Parādīt failu

1469
 #elif ENABLED(TFT_RES_1024x600)
1469
 #elif ENABLED(TFT_RES_1024x600)
1470
   #define TFT_WIDTH  1024
1470
   #define TFT_WIDTH  1024
1471
   #define TFT_HEIGHT 600
1471
   #define TFT_HEIGHT 600
1472
-  #define GRAPHICAL_TFT_UPSCALE 6
1473
-  #define TFT_PIXEL_OFFSET_X 120
1472
+  #if ENABLED(TOUCH_SCREEN)
1473
+    #define GRAPHICAL_TFT_UPSCALE 6
1474
+    #define TFT_PIXEL_OFFSET_X 120
1475
+  #else
1476
+    #define GRAPHICAL_TFT_UPSCALE 8
1477
+    #define TFT_PIXEL_OFFSET_X 0
1478
+  #endif
1474
 #endif
1479
 #endif
1475
 
1480
 
1476
 // FSMC/SPI TFT Panels using standard HAL/tft/tft_(fsmc|spi|ltdc).h
1481
 // FSMC/SPI TFT Panels using standard HAL/tft/tft_(fsmc|spi|ltdc).h

+ 2
- 2
Marlin/src/inc/SanityCheck.h Parādīt failu

2971
   #endif
2971
   #endif
2972
 #endif
2972
 #endif
2973
 
2973
 
2974
-#if defined(GRAPHICAL_TFT_UPSCALE) && !WITHIN(GRAPHICAL_TFT_UPSCALE, 2, 6)
2975
-  #error "GRAPHICAL_TFT_UPSCALE must be between 2 and 6."
2974
+#if defined(GRAPHICAL_TFT_UPSCALE) && !WITHIN(GRAPHICAL_TFT_UPSCALE, 2, 8)
2975
+  #error "GRAPHICAL_TFT_UPSCALE must be between 2 and 8."
2976
 #endif
2976
 #endif
2977
 
2977
 
2978
 #if BOTH(CHIRON_TFT_STANDARD, CHIRON_TFT_NEW)
2978
 #if BOTH(CHIRON_TFT_STANDARD, CHIRON_TFT_NEW)

+ 1
- 1
Marlin/src/lcd/tft/ui_1024x600.cpp Parādīt failu

791
   }
791
   }
792
 #endif
792
 #endif
793
 
793
 
794
-#if HAS_BED_PROBE
794
+#if BOTH(HAS_BED_PROBE, TOUCH_SCREEN)
795
   static void z_select() {
795
   static void z_select() {
796
     motionAxisState.z_selection *= -1;
796
     motionAxisState.z_selection *= -1;
797
     quick_feedback();
797
     quick_feedback();

+ 1
- 1
Marlin/src/lcd/tft/ui_320x240.cpp Parādīt failu

771
   }
771
   }
772
 #endif
772
 #endif
773
 
773
 
774
-#if HAS_BED_PROBE
774
+#if BOTH(HAS_BED_PROBE, TOUCH_SCREEN)
775
   static void z_select() {
775
   static void z_select() {
776
     motionAxisState.z_selection *= -1;
776
     motionAxisState.z_selection *= -1;
777
     quick_feedback();
777
     quick_feedback();

+ 1
- 1
Marlin/src/lcd/tft/ui_480x320.cpp Parādīt failu

772
   }
772
   }
773
 #endif
773
 #endif
774
 
774
 
775
-#if HAS_BED_PROBE
775
+#if BOTH(HAS_BED_PROBE, TOUCH_SCREEN)
776
   static void z_select() {
776
   static void z_select() {
777
     motionAxisState.z_selection *= -1;
777
     motionAxisState.z_selection *= -1;
778
     quick_feedback();
778
     quick_feedback();

Notiek ielāde…
Atcelt
Saglabāt