|
@@ -2723,12 +2723,11 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
2723
|
2723
|
|
2724
|
2724
|
#undef IS_U8GLIB_SSD1306
|
2725
|
2725
|
#undef IS_EXTUI
|
2726
|
|
-#undef IS_LEGACY_TFT
|
2727
|
2726
|
|
2728
|
2727
|
#if ANY(TFT_GENERIC, MKS_TS35_V2_0, MKS_ROBIN_TFT24, MKS_ROBIN_TFT28, MKS_ROBIN_TFT32, MKS_ROBIN_TFT35, MKS_ROBIN_TFT43, MKS_ROBIN_TFT_V1_1R, TFT_TRONXY_X5SA, ANYCUBIC_TFT35, ANYCUBIC_TFT35, LONGER_LK_TFT28, ANET_ET4_TFT28, ANET_ET5_TFT35, BIQU_BX_TFT70)
|
2729
|
2728
|
#if NONE(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI)
|
2730
|
2729
|
#error "TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI is required for your TFT. Please enable one."
|
2731
|
|
- #elif 1 < ENABLED(TFT_COLOR_UI) + ENABLED(TFT_CLASSIC_UI) + ENABLED(TFT_LVGL_UI)
|
|
2730
|
+ #elif MANY(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI)
|
2732
|
2731
|
#error "Please select only one of TFT_COLOR_UI, TFT_CLASSIC_UI, or TFT_LVGL_UI."
|
2733
|
2732
|
#endif
|
2734
|
2733
|
#elif ANY(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI)
|
|
@@ -2751,8 +2750,12 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
2751
|
2750
|
#error "Please select only one of TFT_RES_320x240, TFT_RES_480x272, TFT_RES_480x320, or TFT_RES_1024x600."
|
2752
|
2751
|
#endif
|
2753
|
2752
|
|
2754
|
|
-#if HAS_TFT_LVGL_UI && DISABLED(TFT_RES_480x320)
|
2755
|
|
- #error "(FMSC|SPI)TFT_LVGL_UI requires TFT_RES_480x320."
|
|
2753
|
+#if ENABLED(TFT_LVGL_UI)
|
|
2754
|
+ #if DISABLED(TFT_RES_480x320)
|
|
2755
|
+ #error "TFT_LVGL_UI requires TFT_RES_480x320."
|
|
2756
|
+ #elif DISABLED(SDSUPPORT)
|
|
2757
|
+ #error "TFT_LVGL_UI requires SDSUPPORT."
|
|
2758
|
+ #endif
|
2756
|
2759
|
#endif
|
2757
|
2760
|
|
2758
|
2761
|
#if defined(GRAPHICAL_TFT_UPSCALE) && !WITHIN(GRAPHICAL_TFT_UPSCALE, 2, 4)
|