Browse Source

🔧 Add, update TFT sanity checks (#22928)

ellensp 3 years ago
parent
commit
de5aefd09e
No account linked to committer's email address
3 changed files with 11 additions and 5 deletions
  1. 0
    1
      Marlin/src/inc/Conditionals_LCD.h
  2. 7
    4
      Marlin/src/inc/SanityCheck.h
  3. 4
    0
      Marlin/src/inc/Warnings.cpp

+ 0
- 1
Marlin/src/inc/Conditionals_LCD.h View File

332
 #if ANY(FSMC_GRAPHICAL_TFT, SPI_GRAPHICAL_TFT, TFT_320x240, TFT_480x320, TFT_320x240_SPI, TFT_480x320_SPI, TFT_LVGL_UI_FSMC, TFT_LVGL_UI_SPI)
332
 #if ANY(FSMC_GRAPHICAL_TFT, SPI_GRAPHICAL_TFT, TFT_320x240, TFT_480x320, TFT_320x240_SPI, TFT_480x320_SPI, TFT_LVGL_UI_FSMC, TFT_LVGL_UI_SPI)
333
   #define IS_LEGACY_TFT 1
333
   #define IS_LEGACY_TFT 1
334
   #define TFT_GENERIC
334
   #define TFT_GENERIC
335
-  #warning "Don't forget to update your TFT settings in Configuration.h."
336
 #endif
335
 #endif
337
 
336
 
338
 #if ANY(FSMC_GRAPHICAL_TFT, TFT_320x240, TFT_480x320, TFT_LVGL_UI_FSMC)
337
 #if ANY(FSMC_GRAPHICAL_TFT, TFT_320x240, TFT_480x320, TFT_LVGL_UI_FSMC)

+ 7
- 4
Marlin/src/inc/SanityCheck.h View File

2723
 
2723
 
2724
 #undef IS_U8GLIB_SSD1306
2724
 #undef IS_U8GLIB_SSD1306
2725
 #undef IS_EXTUI
2725
 #undef IS_EXTUI
2726
-#undef IS_LEGACY_TFT
2727
 
2726
 
2728
 #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)
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
   #if NONE(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI)
2728
   #if NONE(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI)
2730
     #error "TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI is required for your TFT. Please enable one."
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
     #error "Please select only one of TFT_COLOR_UI, TFT_CLASSIC_UI, or TFT_LVGL_UI."
2731
     #error "Please select only one of TFT_COLOR_UI, TFT_CLASSIC_UI, or TFT_LVGL_UI."
2733
   #endif
2732
   #endif
2734
 #elif ANY(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI)
2733
 #elif ANY(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI)
2751
   #error "Please select only one of TFT_RES_320x240, TFT_RES_480x272, TFT_RES_480x320, or TFT_RES_1024x600."
2750
   #error "Please select only one of TFT_RES_320x240, TFT_RES_480x272, TFT_RES_480x320, or TFT_RES_1024x600."
2752
 #endif
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
 #endif
2759
 #endif
2757
 
2760
 
2758
 #if defined(GRAPHICAL_TFT_UPSCALE) && !WITHIN(GRAPHICAL_TFT_UPSCALE, 2, 4)
2761
 #if defined(GRAPHICAL_TFT_UPSCALE) && !WITHIN(GRAPHICAL_TFT_UPSCALE, 2, 4)

+ 4
- 0
Marlin/src/inc/Warnings.cpp View File

456
   #endif
456
   #endif
457
 #endif
457
 #endif
458
 
458
 
459
+#if IS_LEGACY_TFT
460
+  #warning "Don't forget to update your TFT settings in Configuration.h."
461
+#endif
462
+
459
 // Ender 3 Pro (but, apparently all Creality 4.2.2 boards)
463
 // Ender 3 Pro (but, apparently all Creality 4.2.2 boards)
460
 #if ENABLED(EMIT_CREALITY_422_WARNING) || MB(CREALITY_V4)
464
 #if ENABLED(EMIT_CREALITY_422_WARNING) || MB(CREALITY_V4)
461
   #warning "Creality 4.2.2 boards may have A4988 or TMC2208_STANDALONE drivers. Check your board and make sure to select the correct DRIVER_TYPE!"
465
   #warning "Creality 4.2.2 boards may have A4988 or TMC2208_STANDALONE drivers. Check your board and make sure to select the correct DRIVER_TYPE!"

Loading…
Cancel
Save