From 8a885dc61b8ded0a02f003915e8883eda3b22f7a Mon Sep 17 00:00:00 2001 From: Victor Oliveira Date: Thu, 15 Oct 2020 20:38:27 -0300 Subject: [PATCH] Fix TOUCH_SCREEN + TFT_LVGL_UI compile (#19754) --- Marlin/src/inc/Conditionals_LCD.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h index 4eeb0e8a4..cbc75cfb6 100644 --- a/Marlin/src/inc/Conditionals_LCD.h +++ b/Marlin/src/inc/Conditionals_LCD.h @@ -926,5 +926,7 @@ #if ENABLED(TOUCH_SCREEN) && !HAS_GRAPHICAL_TFT #undef TOUCH_SCREEN #undef TOUCH_SCREEN_CALIBRATION - #define HAS_TOUCH_XPT2046 1 + #if !HAS_TFT_LVGL_UI + #define HAS_TOUCH_XPT2046 1 + #endif #endif