zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix TOUCH_SCREEN + TFT_LVGL_UI compile (#19754)

Browse source
This commit is contained in:
Victor Oliveira 2020-10-15 20:38:27 -03:00 committed by Scott Lahteine
parent 02b668baf5
commit 13720ce6b2
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/inc/Conditionals_LCD.h
View file

@ -926,5 +926,7 @@
#if ENABLED(TOUCH_SCREEN) && !HAS_GRAPHICAL_TFT #if ENABLED(TOUCH_SCREEN) && !HAS_GRAPHICAL_TFT
#undef TOUCH_SCREEN #undef TOUCH_SCREEN
#undef TOUCH_SCREEN_CALIBRATION #undef TOUCH_SCREEN_CALIBRATION
#define HAS_TOUCH_XPT2046 1 #if !HAS_TFT_LVGL_UI
#define HAS_TOUCH_XPT2046 1
#endif
#endif #endif