[stm32][l475][f469] update lvgl

bsp/stm32/stm32f469-st-disco/board/Kconfig

@@ -9,13 +9,6 @@ config SOC_STM32F469NI
 
 menu "Onboard Peripheral Drivers"
 
-    config BSP_USING_LVGL
-        bool "Enable LVGL"
-        select BSP_USING_LCD_OTM8009A
-        select BSP_USING_TOUCH
-        select PKG_USING_LVGL
-        default n
-
     config BSP_USING_SDRAM
         bool "Enable SDRAM"
         select BSP_USING_FMC
@@ -32,6 +25,13 @@ menu "Onboard Peripheral Drivers"
         select BSP_USING_LCD_MIPI
         default n
 
+    config BSP_USING_LVGL
+        bool "Enable LVGL for LCD"
+        select BSP_USING_LCD_OTM8009A
+        select BSP_USING_TOUCH
+        select PKG_USING_LVGL
+        default n
+
     config BSP_USING_QSPI_FLASH
         bool "Enable QSPI FLASH (N25Q128A qspi1)"
         select BSP_USING_QSPI

bsp/stm32/stm32f469-st-disco/board/ports/lvgl/.ignore_format.yml

-# files format check exclude path, please follow the instructions below to modify;
-# If you need to exclude an entire folder, add the folder path in dir_path;
-# If you need to exclude a file, add the path to the file in file_path.
-
-dir_path:
-- demo

bsp/stm32/stm32f469-st-disco/board/ports/lvgl/SConscript

@@ -2,7 +2,7 @@ from building import *
 import os
 
 cwd = GetCurrentDir()
-
+group = []
 src = Glob('*.c')
 CPPPATH = [cwd]
 
@@ -12,8 +12,8 @@ list = os.listdir(cwd)
 for d in list:
     path = os.path.join(cwd, d)
     if os.path.isfile(os.path.join(path, 'SConscript')):
-        objs = objs + SConscript(os.path.join(d, 'SConscript'))
+        group = group + SConscript(os.path.join(d, 'SConscript'))
 
-group = DefineGroup('LVGL-port', src, depend = ['BSP_USING_LVGL'], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
+group += DefineGroup('LVGL-port', src, depend = ['BSP_USING_LVGL'], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
 
-Return('objs')
+Return('group')

bsp/stm32/stm32f469-st-disco/board/ports/lvgl/demo/src/lv_demo.h

@@ -19,7 +19,7 @@ extern "C" {
 /*********************
  *      DEFINES
  *********************/
- 
+
 /**********************
  *      TYPEDEFS
  **********************/

bsp/stm32/stm32f469-st-disco/board/ports/lvgl/lv_demo.c

@@ -9,11 +9,10 @@
  */
 #include <rtthread.h>
 #include <lvgl.h>
+#include <lv_port_indev.h>
 #define DBG_TAG    "LVGL"
 #define DBG_LVL    DBG_INFO
 #include <rtdbg.h>
-#include <lcd_port.h>
-#include <lv_port_indev.h>
 
 #ifndef LV_THREAD_STACK_SIZE
 #define LV_THREAD_STACK_SIZE 4096

bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/SConscript

 from building import *
+import os
 
 cwd = GetCurrentDir()
-
+group = []
 src = Glob('*.c')
 CPPPATH = [cwd]
 
-group = DefineGroup('LVGL-port', src, depend = ['BSP_USING_LVGL'], CPPPATH = CPPPATH)
+list = os.listdir(cwd)
+for d in list:
+    path = os.path.join(cwd, d)
+    if os.path.isfile(os.path.join(path, 'SConscript')):
+        group = group + SConscript(os.path.join(d, 'SConscript'))
+
+group += DefineGroup('LVGL-port', src, depend = ['BSP_USING_LVGL'], CPPPATH = CPPPATH)
 Return('group')

bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/demo/SConscript

+from building import *
+import os
+
+cwd = GetCurrentDir()
+group = []
+src = Glob('*.c')
+CPPPATH = [cwd]
+
+list = os.listdir(cwd)
+for d in list:
+    path = os.path.join(cwd, d)
+    if os.path.isfile(os.path.join(path, 'SConscript')):
+        group = group + SConscript(os.path.join(d, 'SConscript'))
+
+group += DefineGroup('LVGL-port', src, depend = ['BSP_USING_LVGL'], CPPPATH = CPPPATH)
+Return('group')

bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/demo/lv_demo_calendar.c

+#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, LCD_W, LCD_H);
+    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);
+}

bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/demo/lv_demo_calendar.h

+#ifndef __LV_DEMO_CALENDAR_H__
+#define __LV_DEMO_CALENDAR_H__
+
+void lv_demo_calendar(void);
+
+#endif

bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_demo.c

@@ -9,11 +9,11 @@
  */
 #include <rtthread.h>
 #include <lvgl.h>
+#include <lv_port_indev.h>
+#include <lv_demo_calendar.h>
 #define DBG_TAG    "LVGL"
 #define DBG_LVL    DBG_INFO
 #include <rtdbg.h>
-#include <drv_lcd.h>
-#include <lv_port_indev.h>
 
 #ifndef LV_THREAD_STACK_SIZE
 #define LV_THREAD_STACK_SIZE 4096
@@ -23,60 +23,13 @@
 #define LV_THREAD_PRIO (RT_THREAD_PRIORITY_MAX*2/3)
 #endif
 
-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_example_calendar_1(void)
-{
-    lv_obj_t  * calendar = lv_calendar_create(lv_scr_act());
-    lv_obj_set_size(calendar, LCD_W, LCD_H);
-    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);
-}
-
 static void lvgl_thread(void *parameter)
 {
     /*assign buttons to coordinates*/
     const lv_point_t points_array[] =  {{200,35},{0,0},{70,35},{0,0}};
     lv_indev_set_button_points(button_indev, points_array);
 
-    lv_example_calendar_1();
+    lv_demo_calendar();
 
     while(1)
     {