v1.1.1

packages/artinchip/lvgl-ui/lvgl_v8/lv_drivers/aic_dec.c

@@ -272,7 +272,7 @@ static lv_res_t jpeg_decoder_info(lv_img_decoder_t *decoder, const void *src, lv
         return LV_RES_INV;
     }
 
-#if MPP_JPEG_DEC_OUT_SIZE_LIMIT_ENABLE == 1
+#if defined(MPP_JPEG_DEC_OUT_SIZE_LIMIT_ENABLE)
     int shift = jpeg_size_limit(width, height);
     header->w = width >> shift;
     header->h = height >> shift;
@@ -694,7 +694,7 @@ static lv_res_t aic_decoder_open(lv_img_decoder_t *decoder, lv_img_decoder_dsc_t
     alloc_frame->buf.buf_type = MPP_PHY_ADDR;
 
     int size_shift = 0;
-#if MPP_JPEG_DEC_OUT_SIZE_LIMIT_ENABLE == 1
+#if defined(MPP_JPEG_DEC_OUT_SIZE_LIMIT_ENABLE)
     if (type == MPP_CODEC_VIDEO_DECODER_MJPEG)
         size_shift = jpeg_size_limit(width, height);
 #endif

packages/artinchip/lvgl-ui/lvgl_v8/lv_drivers/aic_dec.h

@@ -13,15 +13,22 @@
 extern "C" {
 #endif
 
+#include <rtconfig.h>
 #include <stdint.h>
 #include <mpp_list.h>
 #include "lvgl.h"
 
 #ifndef MPP_JPEG_DEC_OUT_SIZE_LIMIT_ENABLE
-#define MPP_JPEG_DEC_OUT_SIZE_LIMIT_ENABLE 0
+#define MPP_JPEG_DEC_OUT_SIZE_LIMIT_ENABLE
 #endif
+
+#ifndef MPP_JPEG_DEC_MAX_OUT_WIDTH
 #define MPP_JPEG_DEC_MAX_OUT_WIDTH  2048
+#endif
+
+#ifndef MPP_JPEG_DEC_MAX_OUT_HEIGHT
 #define MPP_JPEG_DEC_MAX_OUT_HEIGHT 2048
+#endif
 
 static inline int jpeg_width_limit(int width)
 {

packages/artinchip/lvgl-ui/lvgl_v8/lv_drivers/lv_fbdev.c

@@ -91,6 +91,16 @@ int fbdev_get_size(int *width, int *height)
     return 0;
 }
 
+unsigned int fbdev_get_screen_width()
+{
+    return g_info.width;
+}
+
+unsigned int fbdev_get_screen_height()
+{
+    return g_info.height;
+}
+
 enum mpp_pixel_format fbdev_get_fmt(void)
 {
     if (g_info.bits_per_pixel == 32)

packages/artinchip/lvgl-ui/lvgl_v8/lv_drivers/lv_fbdev.h

@@ -12,6 +12,7 @@
 extern "C" {
 #endif
 
+#include <rtconfig.h>
 #include "mpp_types.h"
 
 /*
@@ -25,9 +26,20 @@ extern "C" {
 
 */
 
-// #define USE_DRAW_BUF
-#define DRAW_BUF_WIDTH          1024
-#define DRAW_BUF_HEIGHT         600
+#if defined(LV_DISPLAY_ROTATE_EN)
+#ifndef USE_DRAW_BUF
+#define USE_DRAW_BUF
+#endif // USE_DRAW_BUF
+
+#ifndef DRAW_BUF_WIDTH
+#define DRAW_BUF_WIDTH fbdev_get_screen_width()
+#endif // DRAW_BUF_WIDTH
+
+#ifndef DRAW_BUF_HEIGHT
+#define DRAW_BUF_HEIGHT fbdev_get_screen_height()
+#endif // DRAW_BUF_HEIGHT
+
+#endif // LV_DISPLAY_ROTATE_EN
 
 #define MAX_FRAME_NUM 2
 
@@ -48,6 +60,10 @@ int fbdev_get_pitch(void);
 
 int draw_buf_size(int *width, int *height);
 
+unsigned int fbdev_get_screen_width();
+
+unsigned int fbdev_get_screen_height();
+
 enum mpp_pixel_format draw_buf_fmt(void);
 
 int draw_buf_bpp(void);

packages/artinchip/lvgl-ui/lvgl_v8/lv_drivers/lv_port_disp.c

@@ -379,11 +379,6 @@ void lv_port_disp_init(void)
     disp_drv.draw_ctx_deinit = lv_draw_aic_ctx_deinit;
     disp_drv.draw_ctx_size = sizeof(lv_draw_aic_ctx_t);
 
-    /* when define USE_DRAW_BUF, disp_drv.rotated can be
-      LV_DISP_ROT_90/LV_DISP_ROT_180/LV_DISP_ROT_270
-    */
-    //disp_drv.rotated = LV_DISP_ROT_90;
-
     /*Finally register the driver*/
 #ifdef AIC_LVGL_METER_DEMO
     lv_disp_t *disp = lv_disp_drv_register(&disp_drv);
@@ -393,6 +388,10 @@ void lv_port_disp_init(void)
     lv_disp_drv_register(&disp_drv);
 #endif
 
+#if defined(LV_DISPLAY_ROTATE_EN) && defined(LV_ROTATE_DEGREE)
+    lv_disp_set_rotation(lv_disp_get_default(), LV_ROTATE_DEGREE / 90);
+#endif
+
 #ifndef AIC_MONKEY_TEST
 #if defined(KERNEL_RTTHREAD) && defined(AIC_USING_TOUCH)
     result = tpc_run(AIC_TOUCH_PANEL_NAME, info.width, info.height);

packages/artinchip/lvgl-ui/lvgl_v8/lvgl/env_support/rt-thread/lv_rt_thread_port.c

@@ -31,6 +31,7 @@
 extern void lv_port_disp_init(void);
 extern void lv_port_indev_init(void);
 extern void lv_user_gui_init(void);
+extern void lv_wait_sdcard_mounted(void);
 
 static struct rt_thread lvgl_thread;
 static ALIGN(8) rt_uint8_t lvgl_thread_stack[LPKG_LVGL_THREAD_STACK_SIZE];
@@ -59,6 +60,7 @@ void app_notify(rt_uint8_t event, rt_uint8_t mode, void *data)
 
 static void lvgl_thread_entry(void *parameter)
 {
+    lv_wait_sdcard_mounted();
 #if LV_USE_LOG
     lv_log_register_print_cb(lv_rt_log);
 #endif /* LV_USE_LOG */