diff options
14 files changed, 47 insertions, 21 deletions
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/lv_conf.h b/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/lv_conf.h index 8fc13921f0..37dc49bdd5 100644 --- a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/lv_conf.h +++ b/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/lv_conf.h @@ -15,6 +15,8 @@ #define LV_USE_PERF_MONITOR 1 #define LV_COLOR_DEPTH 16 +#define LV_HOR_RES_MAX LCD_WIDTH +#define LV_VER_RES_MAX LCD_HEIGHT #define LV_USE_NXP_SOC 1 //#define LV_USE_GPU_NXP_PXP 1 @@ -23,12 +25,13 @@ #define LV_ATTRIBUTE_MEM_ALIGN_SIZE 64 +#ifdef PKG_USING_LV_MUSIC_DEMO /* music player demo */ -#define LV_HOR_RES_MAX LCD_WIDTH -#define LV_VER_RES_MAX LCD_HEIGHT #define LV_USE_DEMO_RTT_MUSIC 1 #define LV_DEMO_RTT_MUSIC_AUTO_PLAY 1 #define LV_FONT_MONTSERRAT_12 1 #define LV_FONT_MONTSERRAT_16 1 +#define LV_COLOR_SCREEN_TRANSP 1 +#endif /* PKG_USING_LV_MUSIC_DEMO */ #endif diff --git a/bsp/nuvoton/nk-980iot/applications/lvgl/lv_conf.h b/bsp/nuvoton/nk-980iot/applications/lvgl/lv_conf.h index a6769583c9..bfe8643b70 100644 --- a/bsp/nuvoton/nk-980iot/applications/lvgl/lv_conf.h +++ b/bsp/nuvoton/nk-980iot/applications/lvgl/lv_conf.h @@ -24,6 +24,7 @@ //#define LV_USE_DEMO_RTT_MUSIC 1 #if LV_USE_DEMO_RTT_MUSIC + #define LV_COLOR_SCREEN_TRANSP 1 #define LV_DEMO_RTT_MUSIC_AUTO_PLAY 1 #define LV_USE_DEMO_MUSIC 1 diff --git a/bsp/nuvoton/nk-n9h30/applications/lvgl/lv_conf.h b/bsp/nuvoton/nk-n9h30/applications/lvgl/lv_conf.h index 41a3bd2307..1587d341ac 100644 --- a/bsp/nuvoton/nk-n9h30/applications/lvgl/lv_conf.h +++ b/bsp/nuvoton/nk-n9h30/applications/lvgl/lv_conf.h @@ -38,6 +38,7 @@ //#define LV_USE_DEMO_RTT_MUSIC 1 #if LV_USE_DEMO_RTT_MUSIC + #define LV_COLOR_SCREEN_TRANSP 1 #define LV_DEMO_RTT_MUSIC_AUTO_PLAY 1 #define LV_USE_DEMO_MUSIC 1 diff --git a/bsp/nuvoton/numaker-iot-m487/applications/lvgl/lv_conf.h b/bsp/nuvoton/numaker-iot-m487/applications/lvgl/lv_conf.h index a6769583c9..bfe8643b70 100644 --- a/bsp/nuvoton/numaker-iot-m487/applications/lvgl/lv_conf.h +++ b/bsp/nuvoton/numaker-iot-m487/applications/lvgl/lv_conf.h @@ -24,6 +24,7 @@ //#define LV_USE_DEMO_RTT_MUSIC 1 #if LV_USE_DEMO_RTT_MUSIC + #define LV_COLOR_SCREEN_TRANSP 1 #define LV_DEMO_RTT_MUSIC_AUTO_PLAY 1 #define LV_USE_DEMO_MUSIC 1 diff --git a/bsp/nuvoton/numaker-m032ki/applications/lvgl/lv_conf.h b/bsp/nuvoton/numaker-m032ki/applications/lvgl/lv_conf.h index a6769583c9..bfe8643b70 100644 --- a/bsp/nuvoton/numaker-m032ki/applications/lvgl/lv_conf.h +++ b/bsp/nuvoton/numaker-m032ki/applications/lvgl/lv_conf.h @@ -24,6 +24,7 @@ //#define LV_USE_DEMO_RTT_MUSIC 1 #if LV_USE_DEMO_RTT_MUSIC + #define LV_COLOR_SCREEN_TRANSP 1 #define LV_DEMO_RTT_MUSIC_AUTO_PLAY 1 #define LV_USE_DEMO_MUSIC 1 diff --git a/bsp/nuvoton/numaker-m2354/applications/lvgl/lv_conf.h b/bsp/nuvoton/numaker-m2354/applications/lvgl/lv_conf.h index a6769583c9..bfe8643b70 100644 --- a/bsp/nuvoton/numaker-m2354/applications/lvgl/lv_conf.h +++ b/bsp/nuvoton/numaker-m2354/applications/lvgl/lv_conf.h @@ -24,6 +24,7 @@ //#define LV_USE_DEMO_RTT_MUSIC 1 #if LV_USE_DEMO_RTT_MUSIC + #define LV_COLOR_SCREEN_TRANSP 1 #define LV_DEMO_RTT_MUSIC_AUTO_PLAY 1 #define LV_USE_DEMO_MUSIC 1 diff --git a/bsp/nuvoton/numaker-pfm-m487/applications/lvgl/lv_conf.h b/bsp/nuvoton/numaker-pfm-m487/applications/lvgl/lv_conf.h index a6769583c9..bfe8643b70 100644 --- a/bsp/nuvoton/numaker-pfm-m487/applications/lvgl/lv_conf.h +++ b/bsp/nuvoton/numaker-pfm-m487/applications/lvgl/lv_conf.h @@ -24,6 +24,7 @@ //#define LV_USE_DEMO_RTT_MUSIC 1 #if LV_USE_DEMO_RTT_MUSIC + #define LV_COLOR_SCREEN_TRANSP 1 #define LV_DEMO_RTT_MUSIC_AUTO_PLAY 1 #define LV_USE_DEMO_MUSIC 1 diff --git a/bsp/qemu-vexpress-a9/applications/lvgl/lv_conf.h b/bsp/qemu-vexpress-a9/applications/lvgl/lv_conf.h index 43071c8676..1910fe87a4 100644 --- a/bsp/qemu-vexpress-a9/applications/lvgl/lv_conf.h +++ b/bsp/qemu-vexpress-a9/applications/lvgl/lv_conf.h @@ -15,13 +15,16 @@ #define LV_USE_PERF_MONITOR 1 #define LV_COLOR_DEPTH 16 - -/* music player demo */ #define LV_HOR_RES_MAX BSP_LCD_WIDTH #define LV_VER_RES_MAX BSP_LCD_HEIGHT + +#ifdef PKG_USING_LV_MUSIC_DEMO +/* music player demo */ #define LV_USE_DEMO_RTT_MUSIC 1 #define LV_DEMO_RTT_MUSIC_AUTO_PLAY 1 #define LV_FONT_MONTSERRAT_12 1 #define LV_FONT_MONTSERRAT_16 1 +#define LV_COLOR_SCREEN_TRANSP 1 +#endif /* PKG_USING_LV_MUSIC_DEMO */ #endif diff --git a/bsp/raspberry-pico/applications/lvgl/lv_conf.h b/bsp/raspberry-pico/applications/lvgl/lv_conf.h index a5e6be8a2a..c05256b2d6 100644 --- a/bsp/raspberry-pico/applications/lvgl/lv_conf.h +++ b/bsp/raspberry-pico/applications/lvgl/lv_conf.h @@ -14,13 +14,16 @@ #define LV_USE_PERF_MONITOR 1 #define LV_COLOR_DEPTH 16 #define LV_COLOR_16_SWAP 1 +#define LV_HOR_RES_MAX 240 +#define LV_VER_RES_MAX 240 +#ifdef PKG_USING_LV_MUSIC_DEMO /* music player demo */ -#define LV_HOR_RES_MAX 240 -#define LV_VER_RES_MAX 240 #define LV_USE_DEMO_RTT_MUSIC 1 #define LV_DEMO_RTT_MUSIC_AUTO_PLAY 1 #define LV_FONT_MONTSERRAT_12 1 #define LV_FONT_MONTSERRAT_16 1 +#define LV_COLOR_SCREEN_TRANSP 1 +#endif /* PKG_USING_LV_MUSIC_DEMO */ #endif diff --git a/bsp/simulator/applications/lvgl/lv_conf.h b/bsp/simulator/applications/lvgl/lv_conf.h index 9277d41855..af0eac5c91 100644 --- a/bsp/simulator/applications/lvgl/lv_conf.h +++ b/bsp/simulator/applications/lvgl/lv_conf.h @@ -15,18 +15,21 @@ #define LV_USE_PERF_MONITOR 1 #define LV_COLOR_DEPTH 32 +#define LV_HOR_RES_MAX BSP_LCD_WIDTH +#define LV_VER_RES_MAX BSP_LCD_HEIGHT #define USE_WIN32DRV 1 #define WIN32DRV_MONITOR_ZOOM 1 //#define LV_USE_FS_WIN32 1 +#ifdef PKG_USING_LV_MUSIC_DEMO /* music player demo */ -#define LV_HOR_RES_MAX BSP_LCD_WIDTH -#define LV_VER_RES_MAX BSP_LCD_HEIGHT #define LV_USE_DEMO_RTT_MUSIC 1 #define LV_DEMO_RTT_MUSIC_AUTO_PLAY 1 #define LV_FONT_MONTSERRAT_12 1 #define LV_FONT_MONTSERRAT_16 1 +#define LV_COLOR_SCREEN_TRANSP 1 +#endif /* PKG_USING_LV_MUSIC_DEMO */ #endif diff --git a/bsp/stm32/stm32f407-atk-explorer/applications/lvgl/lv_conf.h b/bsp/stm32/stm32f407-atk-explorer/applications/lvgl/lv_conf.h index 97f10aa5fd..d9b2a48268 100644 --- a/bsp/stm32/stm32f407-atk-explorer/applications/lvgl/lv_conf.h +++ b/bsp/stm32/stm32f407-atk-explorer/applications/lvgl/lv_conf.h @@ -11,16 +11,20 @@ #ifndef LV_CONF_H #define LV_CONF_H -#define LV_COLOR_16_SWAP 0 -#define LV_COLOR_DEPTH 16 -#define LV_USE_PERF_MONITOR 1 - #include <rtconfig.h> + +#define LV_COLOR_DEPTH 16 +#define LV_USE_PERF_MONITOR 1 #define LV_HOR_RES_MAX 800 #define LV_VER_RES_MAX 480 + +#ifdef PKG_USING_LV_MUSIC_DEMO +/* music player demo */ #define LV_USE_DEMO_RTT_MUSIC 1 #define LV_DEMO_RTT_MUSIC_AUTO_PLAY 1 #define LV_FONT_MONTSERRAT_12 1 #define LV_FONT_MONTSERRAT_16 1 +#define LV_COLOR_SCREEN_TRANSP 1 +#endif /* PKG_USING_LV_MUSIC_DEMO */ #endif diff --git a/bsp/stm32/stm32f469-st-disco/applications/lvgl/lv_conf.h b/bsp/stm32/stm32f469-st-disco/applications/lvgl/lv_conf.h index 7f3d0ad633..1f1fffae68 100644 --- a/bsp/stm32/stm32f469-st-disco/applications/lvgl/lv_conf.h +++ b/bsp/stm32/stm32f469-st-disco/applications/lvgl/lv_conf.h @@ -13,16 +13,19 @@ #define LV_USE_PERF_MONITOR 1 #define LV_COLOR_DEPTH 16 +#define LV_HOR_RES_MAX 800 +#define LV_VER_RES_MAX 480 #define LV_USE_GPU_STM32_DMA2D 1 #define LV_GPU_DMA2D_CMSIS_INCLUDE "stm32f469xx.h" +#ifdef PKG_USING_LV_MUSIC_DEMO /* music player demo */ -#define LV_HOR_RES_MAX 800 -#define LV_VER_RES_MAX 480 #define LV_USE_DEMO_RTT_MUSIC 1 #define LV_DEMO_RTT_MUSIC_AUTO_PLAY 1 #define LV_FONT_MONTSERRAT_12 1 #define LV_FONT_MONTSERRAT_16 1 +#define LV_COLOR_SCREEN_TRANSP 1 +#endif /* PKG_USING_LV_MUSIC_DEMO */ #endif diff --git a/bsp/stm32/stm32h750-artpi/applications/lvgl/lv_conf.h b/bsp/stm32/stm32h750-artpi/applications/lvgl/lv_conf.h index dd2fc777d7..cdbe8b6812 100644 --- a/bsp/stm32/stm32h750-artpi/applications/lvgl/lv_conf.h +++ b/bsp/stm32/stm32h750-artpi/applications/lvgl/lv_conf.h @@ -16,17 +16,18 @@ #define LCD_W 480 #define LCD_H 320 -#define LV_COLOR_16_SWAP 0 -#define LV_COLOR_DEPTH 32 -#define LV_USE_PERF_MONITOR 1 - +#define LV_COLOR_DEPTH 32 +#define LV_USE_PERF_MONITOR 1 #define LV_HOR_RES_MAX LCD_W #define LV_VER_RES_MAX LCD_H +#ifdef PKG_USING_LV_MUSIC_DEMO +/* music player demo */ #define LV_USE_DEMO_RTT_MUSIC 1 #define LV_DEMO_RTT_MUSIC_AUTO_PLAY 1 - #define LV_FONT_MONTSERRAT_12 1 #define LV_FONT_MONTSERRAT_16 1 +#define LV_COLOR_SCREEN_TRANSP 1 +#endif /* PKG_USING_LV_MUSIC_DEMO */ #endif diff --git a/bsp/stm32/stm32l475-atk-pandora/applications/lvgl/lv_conf.h b/bsp/stm32/stm32l475-atk-pandora/applications/lvgl/lv_conf.h index 8d224d996e..35c5e53536 100644 --- a/bsp/stm32/stm32l475-atk-pandora/applications/lvgl/lv_conf.h +++ b/bsp/stm32/stm32l475-atk-pandora/applications/lvgl/lv_conf.h @@ -11,8 +11,8 @@ #ifndef LV_CONF_H #define LV_CONF_H -#define LV_COLOR_16_SWAP 1 -#define LV_COLOR_DEPTH 16 +#define LV_COLOR_16_SWAP 1 +#define LV_COLOR_DEPTH 16 #define LV_USE_PERF_MONITOR 1 #endif |