Merge pull request #13121 from arendst/SHOW_SPLASH

SHOW_SPLASH and remove redundant code
This commit is contained in:
Jason2866 2021-09-13 16:00:38 +02:00 committed by GitHub
commit f125bffe1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions

View File

@ -61,6 +61,7 @@
#define USE_ADC
#define USE_SPI
#define USE_DISPLAY // Add SPI Display Support (+2k code)
#define SHOW_SPLASH
#ifndef USE_UNIVERSAL_DISPLAY
#define USE_DISPLAY_ILI9341 // [DisplayModel 4] Enable ILI9341 Tft 480x320 display (+19k code)
#endif
@ -93,6 +94,7 @@
#define USE_MPU_ACCEL
#define USE_SPI
#define USE_DISPLAY
#define SHOW_SPLASH
#ifdef USE_UNIVERSAL_DISPLAY
#define USE_LVGL
#define USE_LVGL_FREETYPE
@ -101,7 +103,7 @@
#define USE_DISPLAY_ILI9341 // [DisplayModel 4] Enable ILI9341 Tft 480x320 display (+19k code)
#define USE_DISPLAY_MODES1TO5
#endif
#define USE_TOUCH_BUTTONS
#define USE_TOUCH_BUTTONS
#define JPEG_PICTS
#define USE_FT5206
@ -173,6 +175,7 @@
#define USE_SPI
#define USE_LVGL
#define USE_DISPLAY
#define SHOW_SPLASH
#define USE_XPT2046
#define USE_FT5206
#define USE_MPU_ACCEL
@ -191,9 +194,6 @@
#define USE_ENHANCED_GUI_WIFI_SCAN
#define USE_BERRY // Enable Berry scripting language
//#define USE_BERRY_PSRAM // Allocate Berry memory in PSRAM if PSRAM is connected - this might be slightly slower but leaves main memory intact
#define USE_SDCARD
#define ROTARY_V1 // Add support for Rotary Encoder as used in MI Desk Lamp