bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

LVGL and Classic UI for STM32 (#20552)

Browse Source
This commit is contained in:
Victor Oliveira
2020-12-23 23:01:21 -03:00
committed by GitHub
parent f8c6de0cdc
commit 4d6b6bcffc
22 changed files with 113 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/inc/Conditionals_LCD.h
View File

@ -1187,7 +1187,7 @@
// This emulated DOGM has 'touch/xpt2046', not 'tft/xpt2046'
#if ENABLED(TOUCH_SCREEN) && !HAS_GRAPHICAL_TFT
#undef TOUCH_SCREEN
#if !HAS_TFT_LVGL_UI
#if ENABLED(TFT_CLASSIC_UI)
#define HAS_TOUCH_BUTTONS 1
#endif
#endif

2
Marlin/src/inc/SanityCheck.h
View File

@ -3242,7 +3242,7 @@ static_assert( _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
/**
* Touch Buttons
*/
#if ENABLED(TOUCH_SCREEN)
#if ENABLED(TOUCH_SCREEN) && DISABLED(TOUCH_SCREEN_CALIBRATION)
#ifndef TOUCH_CALIBRATION_X
#error "TOUCH_CALIBRATION_X must be defined with TOUCH_SCREEN."
#endif