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

Support for TFT & Touch Screens (#18130)

Browse Source
This commit is contained in:
Alexander Gavrilenko
2020-07-30 09:43:19 +03:00
committed by GitHub
parent bba157e5bd
commit 117df87d19
176 changed files with 14747 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -255,7 +255,7 @@
#define IS_ULTIPANEL
#endif
// LVGL UI, SPI or FSMC
// FSMC/SPI TFT Panels (LVGL)
#if EITHER(TFT_LVGL_UI_SPI, TFT_LVGL_UI_FSMC)
#define HAS_TFT_LVGL_UI 1
#endif
@ -273,6 +273,27 @@
#define DELAYED_BACKLIGHT_INIT
#endif
// FSMC/SPI TFT Panels (HAL STM32)
#if EITHER(TFT_320x240, TFT_480x320)
#define HAS_FSMC_TFT 1
#elif EITHER(TFT_320x240_SPI, TFT_480x320_SPI)
#define HAS_SPI_TFT 1
#endif
#if HAS_FSMC_TFT || HAS_SPI_TFT
#define HAS_GRAPHICAL_TFT 1
#define IS_ULTIPANEL
#endif
// Fewer lines with touch buttons on-screen
#if EITHER(TFT_320x240, TFT_320x240_SPI)
#define HAS_UI_320x240 1
#define LCD_HEIGHT TERN(TOUCH_SCREEN, 6, 7)
#elif EITHER(TFT_480x320, TFT_480x320_SPI)
#define HAS_UI_480x320 1
#define LCD_HEIGHT TERN(TOUCH_SCREEN, 6, 7)
#endif
/**
* I2C Panels
*/
@ -329,7 +350,7 @@
#endif
#ifndef STD_ENCODER_PULSES_PER_STEP
#if ENABLED(TOUCH_BUTTONS)
#if ENABLED(TOUCH_SCREEN)
#define STD_ENCODER_PULSES_PER_STEP 2
#else
#define STD_ENCODER_PULSES_PER_STEP 5
@ -398,13 +419,14 @@
// Aliases for LCD features
#if EITHER(ULTRA_LCD, EXTENSIBLE_UI)
#define HAS_DISPLAY 1
#if ENABLED(ULTRA_LCD)
#define HAS_SPI_LCD 1
#if ENABLED(DOGLCD)
#define HAS_GRAPHICAL_LCD 1
#else
#define HAS_CHARACTER_LCD 1
#endif
#endif
#if ENABLED(ULTRA_LCD)
#define HAS_SPI_LCD 1
#if ENABLED(DOGLCD)
#define HAS_GRAPHICAL_LCD 1
#elif DISABLED(HAS_GRAPHICAL_TFT)
#define HAS_CHARACTER_LCD 1
#endif
#endif