lvgl · liamHowatt · Aug 1, 2024 · Sep 24, 2024 · Sep 27, 2024 · Oct 4, 2024
diff --git a/Core/Inc/stm32u5xx_hal_conf.h b/Core/Inc/stm32u5xx_hal_conf.h
@@ -217,7 +217,7 @@
 #define  USE_HAL_IRDA_REGISTER_CALLBACKS       0U /* IRDA register callback disabled      */
 #define  USE_HAL_JPEG_REGISTER_CALLBACKS       0U /* JPEG register callback disabled      */
 #define  USE_HAL_LPTIM_REGISTER_CALLBACKS      0U /* LPTIM register callback disabled     */
-#define  USE_HAL_LTDC_REGISTER_CALLBACKS       0U /* LTDC register callback disabled      */
+#define  USE_HAL_LTDC_REGISTER_CALLBACKS       1U /* LTDC register callback disabled      */
 #define  USE_HAL_MDF_REGISTER_CALLBACKS        0U /* MDF register callback disabled       */
 #define  USE_HAL_MMC_REGISTER_CALLBACKS        0U /* MMC register callback disabled       */
 #define  USE_HAL_NAND_REGISTER_CALLBACKS       0U /* NAND register callback disabled      */

diff --git a/Core/Src/app_freertos.c b/Core/Src/app_freertos.c
@@ -48,15 +48,15 @@ osThreadId_t lvglTimerHandle;
 const osThreadAttr_t lvglTimer_attributes = {
   .name = "lvglTimer",
   .priority = (osPriority_t) osPriorityNormal,
-  .stack_size = 4* 1024
+  .stack_size = 16* 1024
 };
 /* USER CODE END Variables */
 /* Definitions for defaultTask */
 osThreadId_t defaultTaskHandle;
 const osThreadAttr_t defaultTask_attributes = {
   .name = "defaultTask",
   .priority = (osPriority_t) osPriorityNormal,
-  .stack_size = 128 * 4
+  .stack_size = 128 * 4 * 32
 };
 
 /* Private function prototypes -----------------------------------------------*/

diff --git a/Core/Src/cordic.c b/Core/Src/cordic.c
@@ -7,7 +7,7 @@
   ******************************************************************************
   * @attention
   *
-  * Copyright (c) 2023 STMicroelectronics.
+  * Copyright (c) 2024 STMicroelectronics.
   * All rights reserved.
   *
   * This software is licensed under terms that can be found in the LICENSE file

diff --git a/Core/Src/crc.c b/Core/Src/crc.c
@@ -7,7 +7,7 @@
   ******************************************************************************
   * @attention
   *
-  * Copyright (c) 2023 STMicroelectronics.
+  * Copyright (c) 2024 STMicroelectronics.
   * All rights reserved.
   *
   * This software is licensed under terms that can be found in the LICENSE file

diff --git a/Core/Src/dac.c b/Core/Src/dac.c
@@ -7,7 +7,7 @@
   ******************************************************************************
   * @attention
   *
-  * Copyright (c) 2023 STMicroelectronics.
+  * Copyright (c) 2024 STMicroelectronics.
   * All rights reserved.
   *
   * This software is licensed under terms that can be found in the LICENSE file

diff --git a/Core/Src/dcache.c b/Core/Src/dcache.c
@@ -7,7 +7,7 @@
   ******************************************************************************
   * @attention
   *
-  * Copyright (c) 2023 STMicroelectronics.
+  * Copyright (c) 2024 STMicroelectronics.
   * All rights reserved.
   *
   * This software is licensed under terms that can be found in the LICENSE file

diff --git a/Core/Src/dma2d.c b/Core/Src/dma2d.c
@@ -7,7 +7,7 @@
   ******************************************************************************
   * @attention
   *
-  * Copyright (c) 2023 STMicroelectronics.
+  * Copyright (c) 2024 STMicroelectronics.
   * All rights reserved.
   *
   * This software is licensed under terms that can be found in the LICENSE file
@@ -19,6 +19,7 @@
 /* USER CODE END Header */
 /* Includes ------------------------------------------------------------------*/
 #include "dma2d.h"
+#include "lvgl/lvgl.h"
 
 /* USER CODE BEGIN 0 */
 
@@ -73,8 +74,10 @@ void HAL_DMA2D_MspInit(DMA2D_HandleTypeDef* dma2dHandle)
   /* USER CODE END DMA2D_MspInit 0 */
     /* DMA2D clock enable */
     __HAL_RCC_DMA2D_CLK_ENABLE();
+    __HAL_RCC_DMA2D_FORCE_RESET();
+    __HAL_RCC_DMA2D_RELEASE_RESET();
 
-    /* DMA2D interrupt Init */
+    /* Enable DMA2D global Interrupt */
     HAL_NVIC_SetPriority(DMA2D_IRQn, 5, 0);
     HAL_NVIC_EnableIRQ(DMA2D_IRQn);
   /* USER CODE BEGIN DMA2D_MspInit 1 */

diff --git a/Core/Src/fdcan.c b/Core/Src/fdcan.c
@@ -7,7 +7,7 @@
   ******************************************************************************
   * @attention
   *
-  * Copyright (c) 2023 STMicroelectronics.
+  * Copyright (c) 2024 STMicroelectronics.
   * All rights reserved.
   *
   * This software is licensed under terms that can be found in the LICENSE file

diff --git a/Core/Src/gpu2d.c b/Core/Src/gpu2d.c
@@ -7,7 +7,7 @@
   ******************************************************************************
   * @attention
   *
-  * Copyright (c) 2023 STMicroelectronics.
+  * Copyright (c) 2024 STMicroelectronics.
   * All rights reserved.
   *
   * This software is licensed under terms that can be found in the LICENSE file

diff --git a/Core/Src/hash.c b/Core/Src/hash.c
@@ -7,7 +7,7 @@
   ******************************************************************************
   * @attention
   *
-  * Copyright (c) 2023 STMicroelectronics.
+  * Copyright (c) 2024 STMicroelectronics.
   * All rights reserved.
   *
   * This software is licensed under terms that can be found in the LICENSE file

diff --git a/Core/Src/icache.c b/Core/Src/icache.c
@@ -7,7 +7,7 @@
   ******************************************************************************
   * @attention
   *
-  * Copyright (c) 2023 STMicroelectronics.
+  * Copyright (c) 2024 STMicroelectronics.
   * All rights reserved.
   *
   * This software is licensed under terms that can be found in the LICENSE file

diff --git a/Core/Src/lptim.c b/Core/Src/lptim.c
@@ -7,7 +7,7 @@
   ******************************************************************************
   * @attention
   *
-  * Copyright (c) 2023 STMicroelectronics.
+  * Copyright (c) 2024 STMicroelectronics.
   * All rights reserved.
   *
   * This software is licensed under terms that can be found in the LICENSE file

diff --git a/Core/Src/ltdc.c b/Core/Src/ltdc.c
@@ -7,7 +7,7 @@
   ******************************************************************************
   * @attention
   *
-  * Copyright (c) 2023 STMicroelectronics.
+  * Copyright (c) 2024 STMicroelectronics.
   * All rights reserved.
   *
   * This software is licensed under terms that can be found in the LICENSE file
@@ -118,15 +118,16 @@ void HAL_LTDC_MspInit(LTDC_HandleTypeDef* ltdcHandle)
 
     __HAL_RCC_GPIOE_CLK_ENABLE();
     __HAL_RCC_GPIOD_CLK_ENABLE();
+    __HAL_RCC_GPIOC_CLK_ENABLE();
     __HAL_RCC_GPIOG_CLK_ENABLE();
     __HAL_RCC_GPIOF_CLK_ENABLE();
     /**LTDC GPIO Configuration
     PE0     ------> LTDC_HSYNC
     PD3     ------> LTDC_CLK
     PD1     ------> LTDC_B5
+    PC6     ------> LTDC_R0
     PD0     ------> LTDC_B4
     PG6     ------> LTDC_R1
-    PE2     ------> LTDC_R0
     PD15     ------> LTDC_B3
     PD11     ------> LTDC_R6
     PF13     ------> LTDC_B1
@@ -150,9 +151,9 @@ void HAL_LTDC_MspInit(LTDC_HandleTypeDef* ltdcHandle)
     PF14     ------> LTDC_G0
     PE14     ------> LTDC_G7
     */
-    GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_2|GPIO_PIN_8|GPIO_PIN_13
-                          |GPIO_PIN_7|GPIO_PIN_15|GPIO_PIN_12|GPIO_PIN_9
-                          |GPIO_PIN_10|GPIO_PIN_11|GPIO_PIN_14;
+    GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_8|GPIO_PIN_13|GPIO_PIN_7
+                          |GPIO_PIN_15|GPIO_PIN_12|GPIO_PIN_9|GPIO_PIN_10
+                          |GPIO_PIN_11|GPIO_PIN_14;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
     GPIO_InitStruct.Pull = GPIO_NOPULL;
     GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
@@ -168,6 +169,13 @@ void HAL_LTDC_MspInit(LTDC_HandleTypeDef* ltdcHandle)
     GPIO_InitStruct.Alternate = GPIO_AF8_LTDC;
     HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
 
+    GPIO_InitStruct.Pin = GPIO_PIN_6;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = GPIO_AF7_LTDC;
+    HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+
     GPIO_InitStruct.Pin = GPIO_PIN_6;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
     GPIO_InitStruct.Pull = GPIO_NOPULL;
@@ -207,9 +215,9 @@ void HAL_LTDC_MspDeInit(LTDC_HandleTypeDef* ltdcHandle)
     PE0     ------> LTDC_HSYNC
     PD3     ------> LTDC_CLK
     PD1     ------> LTDC_B5
+    PC6     ------> LTDC_R0
     PD0     ------> LTDC_B4
     PG6     ------> LTDC_R1
-    PE2     ------> LTDC_R0
     PD15     ------> LTDC_B3
     PD11     ------> LTDC_R6
     PF13     ------> LTDC_B1
@@ -233,14 +241,16 @@ void HAL_LTDC_MspDeInit(LTDC_HandleTypeDef* ltdcHandle)
     PF14     ------> LTDC_G0
     PE14     ------> LTDC_G7
     */
-    HAL_GPIO_DeInit(GPIOE, GPIO_PIN_0|GPIO_PIN_2|GPIO_PIN_8|GPIO_PIN_13
-                          |GPIO_PIN_7|GPIO_PIN_15|GPIO_PIN_12|GPIO_PIN_9
-                          |GPIO_PIN_10|GPIO_PIN_11|GPIO_PIN_14);
+    HAL_GPIO_DeInit(GPIOE, GPIO_PIN_0|GPIO_PIN_8|GPIO_PIN_13|GPIO_PIN_7
+                          |GPIO_PIN_15|GPIO_PIN_12|GPIO_PIN_9|GPIO_PIN_10
+                          |GPIO_PIN_11|GPIO_PIN_14);
 
     HAL_GPIO_DeInit(GPIOD, GPIO_PIN_3|GPIO_PIN_1|GPIO_PIN_0|GPIO_PIN_15
                           |GPIO_PIN_11|GPIO_PIN_12|GPIO_PIN_8|GPIO_PIN_13
                           |GPIO_PIN_14|GPIO_PIN_10|GPIO_PIN_9);
 
+    HAL_GPIO_DeInit(GPIOC, GPIO_PIN_6);
+
     HAL_GPIO_DeInit(GPIOG, GPIO_PIN_6);
 
     HAL_GPIO_DeInit(GPIOF, GPIO_PIN_13|GPIO_PIN_12|GPIO_PIN_11|GPIO_PIN_15

diff --git a/Core/Src/lvgl_port_display.c b/Core/Src/lvgl_port_display.c
@@ -11,14 +11,9 @@
  *  STATIC PROTOTYPES
  **********************/
 
-static void disp_flush (lv_display_t *, const lv_area_t *, uint8_t *);
-static void disp_flush_complete (DMA2D_HandleTypeDef*);
-
 /**********************
  *  STATIC VARIABLES
  **********************/
-static lv_display_t * disp;
-static __attribute__((aligned(32))) uint8_t buf_1[MY_DISP_HOR_RES * MY_DISP_VER_RES * 2];
 
 /**********************
  *   GLOBAL FUNCTIONS
@@ -28,43 +23,18 @@ void lvgl_display_init (void)
 {
 	/* display initialization */
 
-	disp = lv_display_create(MY_DISP_HOR_RES, MY_DISP_VER_RES);
-	lv_display_set_buffers(disp, buf_1, NULL, sizeof(buf_1), LV_DISPLAY_RENDER_MODE_PARTIAL);
-	lv_display_set_flush_cb(disp, disp_flush);
-
-	/* interrupt callback for DMA2D transfer */
-	hdma2d.XferCpltCallback = disp_flush_complete;
-
+#if LV_COLOR_FORMAT == 16
+  static __attribute__((aligned(32))) uint8_t buf_2[MY_DISP_HOR_RES * MY_DISP_VER_RES * 2];
+  lv_st_ltdc_create_direct((void *)0x20000000, buf_2, 0);
+#elif LV_COLOR_FORMAT == 24 || LV_COLOR_FORMAT == 32
+  static __attribute__((aligned(32))) uint8_t buf_1[MY_DISP_HOR_RES * MY_DISP_VER_RES];
+  static __attribute__((aligned(32))) uint8_t buf_2[MY_DISP_HOR_RES * MY_DISP_VER_RES];
+  lv_st_ltdc_create_partial(buf_1, buf_2, sizeof(buf_1), 0);
+#else
+  #error LV_COLOR_FORMAT not supported
+#endif
 }
 
 /**********************
  *   STATIC FUNCTIONS
  **********************/
-
-static void
-disp_flush (lv_display_t * display,
-            const lv_area_t * area,
-            uint8_t * px_map)
-{
-  lv_coord_t width = lv_area_get_width(area);
-  lv_coord_t height = lv_area_get_height(area);
-
-  DMA2D->CR = 0x0U << DMA2D_CR_MODE_Pos;
-  DMA2D->FGPFCCR = DMA2D_INPUT_RGB565;
-  DMA2D->FGMAR = (uint32_t)px_map;
-  DMA2D->FGOR = 0;
-  DMA2D->OPFCCR = DMA2D_OUTPUT_RGB565;
-  DMA2D->OMAR = hltdc.LayerCfg[0].FBStartAdress + 2 * \
-                (area->y1 * MY_DISP_HOR_RES + area->x1);
-  DMA2D->OOR = MY_DISP_HOR_RES - width;
-  DMA2D->NLR = (width << DMA2D_NLR_PL_Pos) | (height << DMA2D_NLR_NL_Pos);
-  DMA2D->IFCR = 0x3FU;
-  DMA2D->CR |= DMA2D_CR_TCIE;
-  DMA2D->CR |= DMA2D_CR_START;
-}
-
-static void
-disp_flush_complete (DMA2D_HandleTypeDef *hdma2d)
-{
-  lv_display_flush_ready(disp);
-}
diff --git a/Core/Src/lvgl_port_touch.c b/Core/Src/lvgl_port_touch.c
@@ -5,6 +5,17 @@
 #include "lvgl_port_touch.h"
 #include "main.h"
 #include "i2c.h"
+#include "cmsis_os2.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+#if LV_USE_OS == LV_OS_NONE
+  #define DELAY_API(ms) HAL_Delay(ms)
+#else
+  #define DELAY_API(ms) osDelay(ms)
+#endif
 
 /**********************
  *  STATIC VARIABLES
@@ -32,11 +43,11 @@ lvgl_touchscreen_init (void)
   /* 'i2c1' bus and touchscreen reset pin are already configure by CubeMX,
    *  here we just need to reset touchscreen controller */
   HAL_GPIO_WritePin(CTP_RST_GPIO_Port, CTP_RST_Pin, GPIO_PIN_SET);
-  HAL_Delay(10);
+  DELAY_API(10);
   HAL_GPIO_WritePin(CTP_RST_GPIO_Port, CTP_RST_Pin, GPIO_PIN_RESET);
-  HAL_Delay(10);
+  DELAY_API(10);
   HAL_GPIO_WritePin(CTP_RST_GPIO_Port, CTP_RST_Pin, GPIO_PIN_SET);
-  HAL_Delay(10);
+  DELAY_API(10);
 
   /* basic LVGL driver initialization */
   lv_indev_t * indev = lv_indev_create();