From 52859175e0013fef058a65a2375454fd3a0106e4 Mon Sep 17 00:00:00 2001 From: YunHorn Technology Date: Fri, 8 Dec 2023 17:37:05 +0800 Subject: [PATCH] display ok on 55JCIX --- Core/Src/main.c | 21 ++++++++++--------- STM32CubeIDE/.cproject | 1 + STM32CubeIDE/.settings/language.settings.xml | 4 ++-- .../Debug/Application/User/Core/subdir.mk | 7 ++++++- .../Debug/Application/User/Startup/subdir.mk | 8 +++---- .../Drivers/STM32WLxx_HAL_Driver/subdir.mk | 12 ++++++++++- STM32CubeIDE/Debug/makefile | 5 +++-- STM32CubeIDE/Debug/objects.list | 12 ++++++++++- STM32CubeIDE/Debug/sources.mk | 1 + STM32CubeIDE/Release/makefile | 2 +- 10 files changed, 51 insertions(+), 22 deletions(-) diff --git a/Core/Src/main.c b/Core/Src/main.c index 35e2447..1019589 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -114,20 +114,16 @@ int main(void) /* USER CODE END SysInit */ /* Initialize all configured peripherals */ - MX_GPIO_Init(); - MX_DMA_Init(); MX_I2C2_Init(); MX_SPI_Init(); - + MX_GPIO_Init(); + MX_DMA_Init(); MX_LoRaWAN_Init(); /* USER CODE BEGIN 2 */ - HAL_Delay(3000); - - /* USER CODE END 2 */ /* Infinite loop */ @@ -135,25 +131,29 @@ int main(void) APP_LOG(TS_OFF, VLEVEL_L, "START LCD init....\r\n"); - BSP_LCD_Init(); + BSP_LCD_Init(); + BSP_LCD_Clear(LCD_COLOR_BLUE); + #if 1 - BSP_LCD_Clear(LCD_COLOR_BLUE); APP_LOG(TS_OFF, VLEVEL_L, "BSP LCD TEST....\r\n"); + BSP_LCD_DisplayOn(); BSP_LCD_Test(); BSP_LCD_DisplayOff(); #endif APP_LOG(TS_OFF, VLEVEL_L, "START Thermal Graph Test....\r\n"); //MLX90640_I2CInit(); - //mlx90640_display_init(); + BSP_LCD_DisplayOn(); + mlx90640_display_init(); while (1) { /* USER CODE END WHILE */ /* USER CODE BEGIN 3 */ + APP_LOG(TS_OFF, VLEVEL_L, "loop display process \r\n"); - mlx90640_display_process(); + mlx90640_display_process(); } while (1) @@ -161,6 +161,7 @@ int main(void) /* USER CODE END WHILE */ MX_LoRaWAN_Process(); + mlx90640_display_process(); /* USER CODE BEGIN 3 */ } diff --git a/STM32CubeIDE/.cproject b/STM32CubeIDE/.cproject index 499ba96..6a7af73 100644 --- a/STM32CubeIDE/.cproject +++ b/STM32CubeIDE/.cproject @@ -127,6 +127,7 @@