From 6cf637f2d9d96187157a7b17aca244ff1028b583 Mon Sep 17 00:00:00 2001 From: lhdjply Date: Sat, 27 Jan 2024 17:46:47 +0800 Subject: [PATCH] chore(demos): Remove unused definitions (#5506) Signed-off-by: lhdjply --- .devcontainer/__lv_conf.h__ | 3 --- Kconfig | 4 ---- demos/README.md | 3 --- env_support/cmsis-pack/lv_conf_cmsis.h | 5 ----- lv_conf_template.h | 3 --- src/lv_conf_internal.h | 9 --------- 6 files changed, 27 deletions(-) diff --git a/.devcontainer/__lv_conf.h__ b/.devcontainer/__lv_conf.h__ index abf4bd69d..f60d1bcb1 100644 --- a/.devcontainer/__lv_conf.h__ +++ b/.devcontainer/__lv_conf.h__ @@ -906,9 +906,6 @@ /*Show some widget. It might be required to increase `LV_MEM_SIZE` */ #define LV_USE_DEMO_WIDGETS 1 -#if LV_USE_DEMO_WIDGETS - #define LV_DEMO_WIDGETS_SLIDESHOW 1 -#endif /*Demonstrate the usage of encoder and keyboard*/ #define LV_USE_DEMO_KEYPAD_AND_ENCODER 1 diff --git a/Kconfig b/Kconfig index 252b7cfa0..8ec79d39e 100644 --- a/Kconfig +++ b/Kconfig @@ -1520,10 +1520,6 @@ menu "LVGL configuration" config LV_USE_DEMO_WIDGETS bool "Show some widget" default n - config LV_DEMO_WIDGETS_SLIDESHOW - bool "Enable slide show" - depends on LV_USE_DEMO_WIDGETS - default n config LV_USE_DEMO_KEYPAD_AND_ENCODER bool "Demonstrate the usage of encoder and keyboard" diff --git a/demos/README.md b/demos/README.md index 230243cd3..0b9e50de6 100644 --- a/demos/README.md +++ b/demos/README.md @@ -13,9 +13,6 @@ /*Show some widget. It might be required to increase `LV_MEM_SIZE` */ #define LV_USE_DEMO_WIDGETS 0 -#if LV_USE_DEMO_WIDGETS -#define LV_DEMO_WIDGETS_SLIDESHOW 0 -#endif /*Demonstrate the usage of encoder and keyboard*/ #define LV_USE_DEMO_KEYPAD_AND_ENCODER 0 diff --git a/env_support/cmsis-pack/lv_conf_cmsis.h b/env_support/cmsis-pack/lv_conf_cmsis.h index 4610119df..01d2a4a15 100644 --- a/env_support/cmsis-pack/lv_conf_cmsis.h +++ b/env_support/cmsis-pack/lv_conf_cmsis.h @@ -820,11 +820,6 @@ * DEMO USAGE ====================*/ -/*Show some widget. It might be required to increase `LV_MEM_SIZE` */ -#if LV_USE_DEMO_WIDGETS - #define LV_DEMO_WIDGETS_SLIDESHOW 0 -#endif - /*Music player demo*/ #if LV_USE_DEMO_MUSIC #define LV_DEMO_MUSIC_SQUARE 0 diff --git a/lv_conf_template.h b/lv_conf_template.h index 6552d7027..46424904f 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -910,9 +910,6 @@ /*Show some widget. It might be required to increase `LV_MEM_SIZE` */ #define LV_USE_DEMO_WIDGETS 0 -#if LV_USE_DEMO_WIDGETS - #define LV_DEMO_WIDGETS_SLIDESHOW 0 -#endif /*Demonstrate the usage of encoder and keyboard*/ #define LV_USE_DEMO_KEYPAD_AND_ENCODER 0 diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index f0842b0d1..637d5651f 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -2982,15 +2982,6 @@ #define LV_USE_DEMO_WIDGETS 0 #endif #endif -#if LV_USE_DEMO_WIDGETS - #ifndef LV_DEMO_WIDGETS_SLIDESHOW - #ifdef CONFIG_LV_DEMO_WIDGETS_SLIDESHOW - #define LV_DEMO_WIDGETS_SLIDESHOW CONFIG_LV_DEMO_WIDGETS_SLIDESHOW - #else - #define LV_DEMO_WIDGETS_SLIDESHOW 0 - #endif - #endif -#endif /*Demonstrate the usage of encoder and keyboard*/ #ifndef LV_USE_DEMO_KEYPAD_AND_ENCODER