Skip to content

Commit 59c2307

Browse files
committed
More updates
1 parent 6653ed8 commit 59c2307

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

Marlin/Configuration.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2274,7 +2274,7 @@
22742274
#define TFT_DRIVER AUTO
22752275

22762276
// Interface. Enable one of the following options:
2277-
#define TFT_INTERFACE_FSMC
2277+
//#define TFT_INTERFACE_FSMC
22782278
//#define TFT_INTERFACE_SPI
22792279

22802280
// TFT Resolution. Enable one of the following options:

Marlin/src/inc/SanityCheck.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2282,6 +2282,10 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
22822282
#error "TFT_(COLOR|CLASSIC|LVGL)_UI requires a TFT display to be enabled."
22832283
#endif
22842284

2285+
#if ENABLED(TFT_GENERIC) && NONE(FSMC_GRAPHICAL_TFT, SPI_GRAPHICAL_TFT)
2286+
#error "TFT_GENERIC requires either (FSMC|SPI)_GRAPHICAL_TFT interface."
2287+
#endif
2288+
22852289
#if BOTH(FSMC_GRAPHICAL_TFT, SPI_GRAPHICAL_TFT)
22862290
#error "Please enable only one of FSMC_GRAPHICAL_TFT or SPI_GRAPHICAL_TFT."
22872291
#endif

buildroot/tests/mks_robin_nano35-tests

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ use_example_configs Mks/Robin
2525
opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO
2626
opt_disable TFT_320x240
2727
opt_disable TOUCH_SCREEN
28-
opt_enable TFT_LVGL_UI_FSMC
28+
opt_enable TFT_LVGL_UI_FSMC TFT_RES_480x320
2929
exec_test $1 $2 "MKS Robin nano v1.2 LVGL FSMC"
3030

3131
use_example_configs Mks/Robin
3232
opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
3333
opt_disable TFT_320x240
3434
opt_disable TOUCH_SCREEN
35-
opt_enable TFT_LVGL_UI_SPI
35+
opt_enable TFT_LVGL_UI_SPI TFT_RES_480x320
3636
exec_test $1 $2 "MKS Robin v2 nano LVGL SPI"
3737

3838
use_example_configs Mks/Robin

0 commit comments

Comments
 (0)