More updates

MarlinFirmware · Oct 14, 2020 · 59c2307 · 59c2307
1 parent 6653ed8
commit 59c2307
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -2274,7 +2274,7 @@
   #define TFT_DRIVER AUTO
 
   // Interface. Enable one of the following options:
-  #define TFT_INTERFACE_FSMC
+  //#define TFT_INTERFACE_FSMC
   //#define TFT_INTERFACE_SPI
 
   // TFT Resolution. Enable one of the following options:

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
@@ -2282,6 +2282,10 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
   #error "TFT_(COLOR|CLASSIC|LVGL)_UI requires a TFT display to be enabled."
 #endif
 
+#if ENABLED(TFT_GENERIC) && NONE(FSMC_GRAPHICAL_TFT, SPI_GRAPHICAL_TFT)
+  #error "TFT_GENERIC requires either (FSMC|SPI)_GRAPHICAL_TFT interface."
+#endif
+
 #if BOTH(FSMC_GRAPHICAL_TFT, SPI_GRAPHICAL_TFT)
   #error "Please enable only one of FSMC_GRAPHICAL_TFT or SPI_GRAPHICAL_TFT."
 #endif

diff --git a/buildroot/tests/mks_robin_nano35-tests b/buildroot/tests/mks_robin_nano35-tests
@@ -25,14 +25,14 @@ use_example_configs Mks/Robin
 opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO
 opt_disable TFT_320x240
 opt_disable TOUCH_SCREEN
-opt_enable TFT_LVGL_UI_FSMC
+opt_enable TFT_LVGL_UI_FSMC TFT_RES_480x320
 exec_test $1 $2 "MKS Robin nano v1.2 LVGL FSMC"
 
 use_example_configs Mks/Robin
 opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
 opt_disable TFT_320x240
 opt_disable TOUCH_SCREEN
-opt_enable TFT_LVGL_UI_SPI
+opt_enable TFT_LVGL_UI_SPI TFT_RES_480x320
 exec_test $1 $2 "MKS Robin v2 nano LVGL SPI"
 
 use_example_configs Mks/Robin