From f6ae47fa94018d1ffe4963eb6766a99514524f3c Mon Sep 17 00:00:00 2001
From: Meco Man <920369182@qq.com>
Date: Tue, 14 Dec 2021 22:05:06 -0500
Subject: [PATCH] [qemu][lvgl] update player demo configuration

---
 bsp/qemu-vexpress-a9/drivers/Kconfig        | 18 ++++++++++--------
 bsp/qemu-vexpress-a9/drivers/lvgl/lv_conf.h | 11 ++++++-----
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/bsp/qemu-vexpress-a9/drivers/Kconfig b/bsp/qemu-vexpress-a9/drivers/Kconfig
index 6528e6ba9..7e0ac0bd1 100644
--- a/bsp/qemu-vexpress-a9/drivers/Kconfig
+++ b/bsp/qemu-vexpress-a9/drivers/Kconfig
@@ -17,6 +17,14 @@ config RT_USING_UART1
     bool "Enable UART1"
     default y
 
+config BSP_USING_LVGL
+    bool "Enable LVGL for LCD"
+    select PKG_USING_LVGL
+    select PKG_USING_LV_MUSIC_DEMO
+    select BSP_DRV_CLCD
+    select BSP_DRV_MOUSE
+    default n
+
 config BSP_DRV_CLCD
     bool "CLCD driver"
     default n
@@ -28,21 +36,15 @@ config BSP_DRV_MOUSE
 if BSP_DRV_CLCD
     config BSP_LCD_WIDTH
         int "Width of LCD panel"
+        default 480 if PKG_USING_LV_MUSIC_DEMO
         default 640
 
     config BSP_LCD_HEIGHT
         int "Height of LCD panel"
+        default 272 if PKG_USING_LV_MUSIC_DEMO
         default 480
 endif
 
-config BSP_USING_LVGL
-    bool "Enable LVGL for LCD"
-    select PKG_USING_LVGL
-    select PKG_USING_LV_MUSIC_DEMO
-    select BSP_DRV_CLCD
-    select BSP_DRV_MOUSE
-    default n
-
 config BSP_DRV_EMAC
     bool "Enable EMAC driver"
     select RT_USING_LWIP
diff --git a/bsp/qemu-vexpress-a9/drivers/lvgl/lv_conf.h b/bsp/qemu-vexpress-a9/drivers/lvgl/lv_conf.h
index d78a191ad..7cb0d4617 100644
--- a/bsp/qemu-vexpress-a9/drivers/lvgl/lv_conf.h
+++ b/bsp/qemu-vexpress-a9/drivers/lvgl/lv_conf.h
@@ -14,11 +14,12 @@
 #define LV_USE_PERF_MONITOR     1
 #define LV_COLOR_DEPTH          16
 
-#define LV_HOR_RES_MAX          (640)
-#define LV_VER_RES_MAX          (480)
-
-#define LV_USE_DEMO_MUSIC           1
-#define LV_DEMO_MUSIC_AUTO_PLAY     1
+/* music player demo */
+#include <rtconfig.h>
+#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
 
-- 
GitLab