add lvgl

APP_Framework/Applications/Makefile

@@ -2,6 +2,12 @@ SRC_DIR := general_functions app_test
 
 SRC_FILES := main.c framework_init.c 
 
+ifeq ($(CONFIG_LIB_LV),y)
+SRC_FILES += lv_init.c
+
+SRC_DIR += lv_app
+endif
+
 ifeq ($(CONFIG_APPLICATION_OTA),y)
 	SRC_DIR += ota
 endif

APP_Framework/Applications/framework_init.c

@@ -34,6 +34,8 @@ extern int Tb600bIaq10IaqInit(void);
 extern int Tb600bTvoc10TvocInit(void);
 extern int Tb600bWqHcho1osInit(void);
 
+extern int lv_port_init(void);
+
 typedef int (*InitFunc)(void);
 struct InitDesc
 {
@@ -200,5 +202,9 @@ int FrameworkInit()
 	ConnectionDeviceFrameworkInit(framework);
 #endif
 
+#ifdef LIB_LV
+	lv_port_init();
+#endif
+
     return 0;
 }

APP_Framework/Applications/lv_app/Makefile

@@ -0,0 +1,3 @@
+SRC_FILES := lv_demo.c lv_demo_calendar.c 
+
+include $(KERNEL_ROOT)/compiler.mk

APP_Framework/Applications/lv_app/lv_demo.c

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2006-2021, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author        Notes
+ * 2021-10-17     Meco Man      First version
+ */
+#include <lvgl.h>
+#include <lv_port_indev_template.h>
+#include "lv_demo_calendar.h"
+#include <transform.h>
+
+void* lvgl_thread(void *parameter)
+{
+    /* display demo; you may replace with your LVGL application at here */
+    lv_demo_calendar();
+
+    /* handle the tasks of LVGL */
+    while(1)
+    {
+        lv_task_handler();
+        PrivTaskDelay(10);
+    }
+}
+
+pthread_t lvgl_task;
+static int lvgl_demo_init(void)
+{
+    pthread_attr_t attr;
+    attr.schedparam.sched_priority = 20;
+    attr.stacksize = 4096;
+
+    PrivTaskCreate(&lvgl_task, &attr, lvgl_thread, NULL);
+
+    return 0;
+}
+SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0),lvgl_demo_init, lvgl_demo_init, lvgl_demo_init );
+

APP_Framework/Applications/lv_app/lv_demo_calendar.c

@@ -0,0 +1,50 @@
+#include <lvgl.h>
+#include "lv_demo_calendar.h"
+// #include <drv_lcd.h>
+
+static void event_handler(lv_event_t * e)
+{
+    lv_event_code_t code = lv_event_get_code(e);
+    lv_obj_t * obj = lv_event_get_current_target(e);
+
+    if(code == LV_EVENT_VALUE_CHANGED) {
+        lv_calendar_date_t date;
+        if(lv_calendar_get_pressed_date(obj, &date)) {
+            LV_LOG_USER("Clicked date: %02d.%02d.%d", date.day, date.month, date.year);
+        }
+    }
+}
+
+void lv_demo_calendar(void)
+{
+    lv_obj_t  * calendar = lv_calendar_create(lv_scr_act());
+    lv_obj_set_size(calendar, 240, 240);
+    lv_obj_align(calendar, LV_ALIGN_CENTER, 0, 0);
+    lv_obj_add_event_cb(calendar, event_handler, LV_EVENT_ALL, NULL);
+
+    lv_calendar_set_today_date(calendar, 2021, 02, 23);
+    lv_calendar_set_showed_date(calendar, 2021, 02);
+
+    /*Highlight a few days*/
+    static lv_calendar_date_t highlighted_days[3];       /*Only its pointer will be saved so should be static*/
+    highlighted_days[0].year = 2021;
+    highlighted_days[0].month = 02;
+    highlighted_days[0].day = 6;
+
+    highlighted_days[1].year = 2021;
+    highlighted_days[1].month = 02;
+    highlighted_days[1].day = 11;
+
+    highlighted_days[2].year = 2022;
+    highlighted_days[2].month = 02;
+    highlighted_days[2].day = 22;
+
+    lv_calendar_set_highlighted_dates(calendar, highlighted_days, 3);
+
+#if LV_USE_CALENDAR_HEADER_DROPDOWN
+    lv_calendar_header_dropdown_create(calendar);
+#elif LV_USE_CALENDAR_HEADER_ARROW
+    lv_calendar_header_arrow_create(calendar);
+#endif
+    lv_calendar_set_showed_date(calendar, 2021, 10);
+}

APP_Framework/Applications/lv_app/lv_demo_calendar.h

@@ -0,0 +1,6 @@
+#ifndef __LV_DEMO_CALENDAR_H__
+#define __LV_DEMO_CALENDAR_H__
+
+void lv_demo_calendar(void);
+
+#endif

APP_Framework/Applications/lv_init.c

@@ -0,0 +1,38 @@
+#include <lvgl.h>
+#define DBG_TAG    "LVGL"
+#define DBG_LVL    DBG_INFO
+
+#ifndef PKG_USING_LVGL_DISP_DEVICE
+#include <lv_port_disp_template.h>
+#endif
+
+#ifndef PKG_USING_LVGL_INDEV_DEVICE
+#include <lv_port_indev_template.h>
+#endif
+extern void lv_port_disp_init(void);
+extern void lv_port_indev_init(void);
+#if LV_USE_LOG && LV_LOG_PRINTF
+static void lv_rt_log(const char *buf)
+{
+    LOG_I(buf);
+}
+#endif
+
+int lv_port_init(void)
+{
+#if LV_USE_LOG && LV_LOG_PRINTF
+    lv_log_register_print_cb(lv_rt_log);
+#endif
+
+    lv_init();
+
+#ifndef PKG_USING_LVGL_DISP_DEVICE
+    lv_port_disp_init();
+#endif
+#ifndef PKG_USING_LVGL_INDEV_DEVICE
+    lv_port_indev_init();
+#endif
+
+    return 0;
+}
+

APP_Framework/Framework/transform_layer/xiuos/transform.c

@@ -138,6 +138,13 @@ static int PrivPinIoctl(int fd, int cmd, void *args)
     return ioctl(fd, cmd, pin_cfg);
 }
 
+static int PrivLcdIoctl(int fd, int cmd, void *args)
+{
+    struct DeviceLcdInfo *lcd_cfg = (struct DeviceLcdInfo *)args;
+
+    return ioctl(fd, cmd, lcd_cfg);
+}
+
 int PrivIoctl(int fd, int cmd, void *args)
 {
     int ret;
@@ -154,6 +161,9 @@ int PrivIoctl(int fd, int cmd, void *args)
     case I2C_TYPE:
         ret = ioctl(fd, cmd, ioctl_cfg->args);
         break;
+    case LCD_TYPE:
+        ret = PrivLcdIoctl(fd, cmd, ioctl_cfg->args);
+        break;
     default:
         break;
     }

APP_Framework/Framework/transform_layer/xiuos/transform.h

@@ -138,6 +138,7 @@ enum IoctlDriverType
     SPI_TYPE,
     I2C_TYPE,
     PIN_TYPE,
+    LCD_TYPE,
     DEFAULT_TYPE,
 };
 
@@ -147,6 +148,32 @@ struct PrivIoctlCfg
     void *args;
 };
 
+typedef struct 
+{
+    uint16 x_pos;
+    uint16 y_pos;
+    uint16 width;
+    uint16 height;
+    uint8 font_size;
+    uint8 *addr;
+    uint16 font_color;
+    uint16 back_color;
+}LcdStringParam;
+
+typedef struct 
+{
+    uint16 x_pos;
+    uint16 y_pos;
+    uint16 pixel_color;
+}LcdPixelParam;
+
+typedef struct 
+{
+    char type; // 0:write string;1:write dot
+    LcdStringParam string_info;
+    LcdPixelParam pixel_info; 
+}LcdWriteParam;
+
 /**********************mutex**************************/
 
 int PrivMutexCreate(pthread_mutex_t *p_mutex, const pthread_mutexattr_t *attr);

APP_Framework/lib/Kconfig

@@ -1,5 +1,4 @@
 menu "lib"
-   
     choice
             prompt "chose a kind of lib for app"
             default APP_SELECT_NEWLIB
@@ -12,4 +11,5 @@ menu "lib"
     endchoice
      source "$APP_DIR/lib/cJSON/Kconfig"
 	 source "$APP_DIR/lib/queue/Kconfig"
+     source "$APP_DIR/lib/lvgl/Kconfig"
 endmenu

APP_Framework/lib/Makefile

@@ -1,9 +1,13 @@
-SRC_DIR := 
+# SRC_DIR := lvgl
 
 ifeq ($(CONFIG_APP_SELECT_NEWLIB),y)
-		ifeq ($(CONFIG_SEPARATE_COMPILE),y)
-			SRC_DIR += app_newlib
-		endif	
+	ifeq ($(CONFIG_SEPARATE_COMPILE),y)
+		SRC_DIR += app_newlib
+	endif	
+endif
+
+ifeq ($(CONFIG_LIB_LV),y)
+	SRC_DIR += lvgl
 endif