From 5a063ba2c560388657593951e3f94f7f2d41bbbd Mon Sep 17 00:00:00 2001 From: YunHorn Technology Date: Fri, 11 Aug 2023 21:12:15 +0800 Subject: [PATCH] Restore from park files --- Core/Src/gpio.c | 17 +++----- Core/Src/main.c | 18 +++++---- Core/Src/spi.c | 8 ++-- .../Debug/Application/User/Core/subdir.mk | 6 +-- .../Application/User/LoRaWAN/App/subdir.mk | 6 +-- .../Application/User/LoRaWAN/Target/subdir.mk | 6 +-- .../Debug/Application/User/Startup/subdir.mk | 6 +-- .../Drivers/BSP/STM32WLxx_Nucleo/subdir.mk | 6 +-- STM32CubeIDE/Debug/Drivers/CMSIS/subdir.mk | 6 +-- .../Drivers/STM32WLxx_HAL_Driver/subdir.mk | 6 +-- .../Debug/Middlewares/LoRaWAN/subdir.mk | 6 +-- .../Debug/Middlewares/SubGHz_Phy/subdir.mk | 6 +-- STM32CubeIDE/Debug/Utilities/subdir.mk | 6 +-- STM32CubeIDE/Debug/makefile | 40 +++++++++---------- STM32CubeIDE/Debug/objects.mk | 2 +- STM32CubeIDE/Debug/sources.mk | 4 +- mlx90640/mlx90640_lcd_display.c | 2 +- mlx90640/st7789.c | 12 +++--- mlx90640/stm32_hx8347d_lcd.c | 19 ++++++--- 19 files changed, 92 insertions(+), 90 deletions(-) diff --git a/Core/Src/gpio.c b/Core/Src/gpio.c index f4c3ef1..6f80aaf 100644 --- a/Core/Src/gpio.c +++ b/Core/Src/gpio.c @@ -56,11 +56,10 @@ void MX_GPIO_Init(void) /*Configure GPIO pin Output Level */ //HAL_GPIO_WritePin(GPIOA, LCD_CS_Pin|LCD_RES_Pin|W25Q_CS_Pin, GPIO_PIN_RESET); HAL_GPIO_WritePin(LCD_RST_GPIO_Port, LCD_RST_Pin, GPIO_PIN_SET); + HAL_GPIO_WritePin(LCD_BL_GPIO_Port, LCD_BL_Pin, GPIO_PIN_SET); + HAL_GPIO_WritePin(LCD_CS_GPIO_Port, LCD_CS_Pin, GPIO_PIN_SET); + HAL_GPIO_WritePin(LCD_DC_GPIO_Port, LCD_DC_Pin, GPIO_PIN_SET); - HAL_GPIO_WritePin(LCD_BL_GPIO_Port, LCD_BL_Pin, GPIO_PIN_SET); - HAL_GPIO_WritePin(LCD_CS_GPIO_Port, LCD_CS_Pin, GPIO_PIN_SET); - HAL_GPIO_WritePin(LCD_DC_GPIO_Port, LCD_DC_Pin, GPIO_PIN_SET); - HAL_GPIO_WritePin(GPIOA, GPIO_PIN_4, GPIO_PIN_SET); /*Configure GPIO pin Output Level */ //HAL_GPIO_WritePin(GPIOB, LCD_TE_Pin|LCD_DC_Pin|LED_Pin, GPIO_PIN_RESET); @@ -95,21 +94,15 @@ void MX_GPIO_Init(void) GPIO_InitStruct.Pin = LCD_CS_Pin; GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; GPIO_InitStruct.Pull = GPIO_NOPULL; - GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH; HAL_GPIO_Init(LCD_CS_GPIO_Port, &GPIO_InitStruct); - GPIO_InitStruct.Pin = GPIO_PIN_4; - GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; - GPIO_InitStruct.Pull = GPIO_NOPULL; - GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; - HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); - /*Configure GPIO pins : PBPin PBPin PBPin */ GPIO_InitStruct.Pin = LCD_RST_Pin|LCD_BL_Pin|LCD_DC_Pin; GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; GPIO_InitStruct.Pull = GPIO_NOPULL; - GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH; HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); /* EXTI interrupt init*/ diff --git a/Core/Src/main.c b/Core/Src/main.c index 163a195..fd210df 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -104,21 +104,23 @@ int main(void) MX_LoRaWAN_Init(); /* USER CODE BEGIN 2 */ //MX_ADC_Init(); + + MX_GPIO_Init(); - MX_DMA_Init(); - MX_SPI_Init(); - - MX_I2C_Init(); - + MX_SPI_Init(); + MX_DMA_Init(); APP_LOG(TS_OFF, VLEVEL_L, "START LCD init....\r\n"); BSP_LCD_Init(); BSP_LCD_DisplayOn(); - //HAL_Delay(2000); - //BSP_LCD_DisplayOff(); - BSP_LCD_Test(); + + //APP_LOG(TS_OFF, VLEVEL_L, "BSP LCD TEST....\r\n"); + //BSP_LCD_Test(); + +// BSP_LCD_DisplayOff(); + APP_LOG(TS_OFF, VLEVEL_L, "START Thermal Graph Test....\r\n"); //MLX90640_I2CInit(); diff --git a/Core/Src/spi.c b/Core/Src/spi.c index 624930c..dc90b55 100644 --- a/Core/Src/spi.c +++ b/Core/Src/spi.c @@ -52,10 +52,10 @@ void MX_SPI_Init(void) hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_2; //SPI_BAUDRATEPRESCALER_64; hspi1.Init.FirstBit = SPI_FIRSTBIT_MSB; //hspi1.Init.TIMode = SPI_TIMODE_DISABLE; - hspi1.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE; -// hspi1.Init.CRCPolynomial = 7; + //hspi1.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE; + hspi1.Init.CRCPolynomial = 7; //hspi1.Init.CRCLength = SPI_CRC_LENGTH_DATASIZE; - //hspi1.Init.NSSPMode = SPI_NSS_PULSE_ENABLE; + hspi1.Init.NSSPMode = SPI_NSS_PULSE_ENABLE; if (HAL_SPI_Init(&hspi1) != HAL_OK) { Error_Handler(); @@ -139,7 +139,7 @@ void HAL_SPI_MspInit(SPI_HandleTypeDef* spiHandle) hdma_spi1_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_HALFWORD; hdma_spi1_tx.Init.MemDataAlignment = DMA_MDATAALIGN_HALFWORD; hdma_spi1_tx.Init.Mode = DMA_NORMAL; - hdma_spi1_tx.Init.Priority = DMA_PRIORITY_LOW; + hdma_spi1_tx.Init.Priority = DMA_PRIORITY_HIGH; if (HAL_DMA_Init(&hdma_spi1_tx) != HAL_OK) { Error_Handler(); diff --git a/STM32CubeIDE/Debug/Application/User/Core/subdir.mk b/STM32CubeIDE/Debug/Application/User/Core/subdir.mk index 8039a20..77ab3f7 100644 --- a/STM32CubeIDE/Debug/Application/User/Core/subdir.mk +++ b/STM32CubeIDE/Debug/Application/User/Core/subdir.mk @@ -1,9 +1,9 @@ ################################################################################ -# Automatically-generated file. Do not edit! +# 自动生成的文件。不要编辑！ # Toolchain: GNU Tools for STM32 (11.3.rel1) ################################################################################ -# Add inputs and outputs from these tool invocations to the build variables +# 将这些工具调用的输入和输出添加到构建变量 C_SRCS += \ D://ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/ThermalGraph_POC_WL55JC/Core/Src/adc.c \ D://ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/ThermalGraph_POC_WL55JC/Core/Src/adc_if.c \ @@ -74,7 +74,7 @@ C_DEPS += \ ./Application/User/Core/usart_if.d -# Each subdirectory must supply rules for building sources it contributes +# 每个子目录必须为构建它所贡献的源提供规则 Application/User/Core/adc.o: D://ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/ThermalGraph_POC_WL55JC/Core/Src/adc.c Application/User/Core/subdir.mk arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Og -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" Application/User/Core/adc_if.o: D://ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/ThermalGraph_POC_WL55JC/Core/Src/adc_if.c Application/User/Core/subdir.mk diff --git a/STM32CubeIDE/Debug/Application/User/LoRaWAN/App/subdir.mk b/STM32CubeIDE/Debug/Application/User/LoRaWAN/App/subdir.mk index 09b0bf3..6ad999f 100644 --- a/STM32CubeIDE/Debug/Application/User/LoRaWAN/App/subdir.mk +++ b/STM32CubeIDE/Debug/Application/User/LoRaWAN/App/subdir.mk @@ -1,9 +1,9 @@ ################################################################################ -# Automatically-generated file. Do not edit! +# 自动生成的文件。不要编辑！ # Toolchain: GNU Tools for STM32 (11.3.rel1) ################################################################################ -# Add inputs and outputs from these tool invocations to the build variables +# 将这些工具调用的输入和输出添加到构建变量 C_SRCS += \ D://ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/ThermalGraph_POC_WL55JC/LoRaWAN/App/CayenneLpp.c \ D://ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/ThermalGraph_POC_WL55JC/LoRaWAN/App/app_lorawan.c \ @@ -23,7 +23,7 @@ C_DEPS += \ ./Application/User/LoRaWAN/App/lora_info.d -# Each subdirectory must supply rules for building sources it contributes +# 每个子目录必须为构建它所贡献的源提供规则 Application/User/LoRaWAN/App/CayenneLpp.o: D://ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/ThermalGraph_POC_WL55JC/LoRaWAN/App/CayenneLpp.c Application/User/LoRaWAN/App/subdir.mk arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Og -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" Application/User/LoRaWAN/App/app_lorawan.o: D://ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/ThermalGraph_POC_WL55JC/LoRaWAN/App/app_lorawan.c Application/User/LoRaWAN/App/subdir.mk diff --git a/STM32CubeIDE/Debug/Application/User/LoRaWAN/Target/subdir.mk b/STM32CubeIDE/Debug/Application/User/LoRaWAN/Target/subdir.mk index 7712d2f..baffd3e 100644 --- a/STM32CubeIDE/Debug/Application/User/LoRaWAN/Target/subdir.mk +++ b/STM32CubeIDE/Debug/Application/User/LoRaWAN/Target/subdir.mk @@ -1,9 +1,9 @@ ################################################################################ -# Automatically-generated file. Do not edit! +# 自动生成的文件。不要编辑！ # Toolchain: GNU Tools for STM32 (11.3.rel1) ################################################################################ -# Add inputs and outputs from these tool invocations to the build variables +# 将这些工具调用的输入和输出添加到构建变量 C_SRCS += \ D://ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/ThermalGraph_POC_WL55JC/LoRaWAN/Target/radio_board_if.c @@ -14,7 +14,7 @@ C_DEPS += \ ./Application/User/LoRaWAN/Target/radio_board_if.d -# Each subdirectory must supply rules for building sources it contributes +# 每个子目录必须为构建它所贡献的源提供规则 Application/User/LoRaWAN/Target/radio_board_if.o: D://ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/ThermalGraph_POC_WL55JC/LoRaWAN/Target/radio_board_if.c Application/User/LoRaWAN/Target/subdir.mk arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Og -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" diff --git a/STM32CubeIDE/Debug/Application/User/Startup/subdir.mk b/STM32CubeIDE/Debug/Application/User/Startup/subdir.mk index 6c3a47b..b821303 100644 --- a/STM32CubeIDE/Debug/Application/User/Startup/subdir.mk +++ b/STM32CubeIDE/Debug/Application/User/Startup/subdir.mk @@ -1,9 +1,9 @@ ################################################################################ -# Automatically-generated file. Do not edit! +# 自动生成的文件。不要编辑！ # Toolchain: GNU Tools for STM32 (11.3.rel1) ################################################################################ -# Add inputs and outputs from these tool invocations to the build variables +# 将这些工具调用的输入和输出添加到构建变量 S_SRCS += \ ../Application/User/Startup/startup_stm32wl55jcix.s @@ -14,7 +14,7 @@ S_DEPS += \ ./Application/User/Startup/startup_stm32wl55jcix.d -# Each subdirectory must supply rules for building sources it contributes +# 每个子目录必须为构建它所贡献的源提供规则 Application/User/Startup/%.o: ../Application/User/Startup/%.s Application/User/Startup/subdir.mk arm-none-eabi-gcc -mcpu=cortex-m4 -g3 -DDEBUG -c -x assembler-with-cpp -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" "$<" diff --git a/STM32CubeIDE/Debug/Drivers/BSP/STM32WLxx_Nucleo/subdir.mk b/STM32CubeIDE/Debug/Drivers/BSP/STM32WLxx_Nucleo/subdir.mk index 7e83dad..4657fe4 100644 --- a/STM32CubeIDE/Debug/Drivers/BSP/STM32WLxx_Nucleo/subdir.mk +++ b/STM32CubeIDE/Debug/Drivers/BSP/STM32WLxx_Nucleo/subdir.mk @@ -1,9 +1,9 @@ ################################################################################ -# Automatically-generated file. Do not edit! +# 自动生成的文件。不要编辑！ # Toolchain: GNU Tools for STM32 (11.3.rel1) ################################################################################ -# Add inputs and outputs from these tool invocations to the build variables +# 将这些工具调用的输入和输出添加到构建变量 C_SRCS += \ D:/ONEDRIVE/STM32WLV13/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c \ D:/ONEDRIVE/STM32WLV13/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c @@ -17,7 +17,7 @@ C_DEPS += \ ./Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.d -# Each subdirectory must supply rules for building sources it contributes +# 每个子目录必须为构建它所贡献的源提供规则 Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.o: D:/ONEDRIVE/STM32WLV13/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c Drivers/BSP/STM32WLxx_Nucleo/subdir.mk arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Og -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.o: D:/ONEDRIVE/STM32WLV13/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c Drivers/BSP/STM32WLxx_Nucleo/subdir.mk diff --git a/STM32CubeIDE/Debug/Drivers/CMSIS/subdir.mk b/STM32CubeIDE/Debug/Drivers/CMSIS/subdir.mk index 1a1bbb2..af7aa53 100644 --- a/STM32CubeIDE/Debug/Drivers/CMSIS/subdir.mk +++ b/STM32CubeIDE/Debug/Drivers/CMSIS/subdir.mk @@ -1,9 +1,9 @@ ################################################################################ -# Automatically-generated file. Do not edit! +# 自动生成的文件。不要编辑！ # Toolchain: GNU Tools for STM32 (11.3.rel1) ################################################################################ -# Add inputs and outputs from these tool invocations to the build variables +# 将这些工具调用的输入和输出添加到构建变量 C_SRCS += \ D://ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/ThermalGraph_POC_WL55JC/Core/Src/system_stm32wlxx.c @@ -14,7 +14,7 @@ C_DEPS += \ ./Drivers/CMSIS/system_stm32wlxx.d -# Each subdirectory must supply rules for building sources it contributes +# 每个子目录必须为构建它所贡献的源提供规则 Drivers/CMSIS/system_stm32wlxx.o: D://ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/ThermalGraph_POC_WL55JC/Core/Src/system_stm32wlxx.c Drivers/CMSIS/subdir.mk arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Og -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" diff --git a/STM32CubeIDE/Debug/Drivers/STM32WLxx_HAL_Driver/subdir.mk b/STM32CubeIDE/Debug/Drivers/STM32WLxx_HAL_Driver/subdir.mk index 239db40..abbd50b 100644 --- a/STM32CubeIDE/Debug/Drivers/STM32WLxx_HAL_Driver/subdir.mk +++ b/STM32CubeIDE/Debug/Drivers/STM32WLxx_HAL_Driver/subdir.mk @@ -1,9 +1,9 @@ ################################################################################ -# Automatically-generated file. Do not edit! +# 自动生成的文件。不要编辑！ # Toolchain: GNU Tools for STM32 (11.3.rel1) ################################################################################ -# Add inputs and outputs from these tool invocations to the build variables +# 将这些工具调用的输入和输出添加到构建变量 C_SRCS += \ D:/ONEDRIVE/STM32WLV13/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c \ D:/ONEDRIVE/STM32WLV13/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c \ @@ -89,7 +89,7 @@ C_DEPS += \ ./Drivers/STM32WLxx_HAL_Driver/stm32wlxx_ll_adc.d -# Each subdirectory must supply rules for building sources it contributes +# 每个子目录必须为构建它所贡献的源提供规则 Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.o: D:/ONEDRIVE/STM32WLV13/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c Drivers/STM32WLxx_HAL_Driver/subdir.mk arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Og -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc.o: D:/ONEDRIVE/STM32WLV13/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c Drivers/STM32WLxx_HAL_Driver/subdir.mk diff --git a/STM32CubeIDE/Debug/Middlewares/LoRaWAN/subdir.mk b/STM32CubeIDE/Debug/Middlewares/LoRaWAN/subdir.mk index 449c9e7..ead8d3d 100644 --- a/STM32CubeIDE/Debug/Middlewares/LoRaWAN/subdir.mk +++ b/STM32CubeIDE/Debug/Middlewares/LoRaWAN/subdir.mk @@ -1,9 +1,9 @@ ################################################################################ -# Automatically-generated file. Do not edit! +# 自动生成的文件。不要编辑！ # Toolchain: GNU Tools for STM32 (11.3.rel1) ################################################################################ -# Add inputs and outputs from these tool invocations to the build variables +# 将这些工具调用的输入和输出添加到构建变量 C_SRCS += \ D:/ONEDRIVE/STM32WLV13/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c \ D:/ONEDRIVE/STM32WLV13/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c \ @@ -110,7 +110,7 @@ C_DEPS += \ ./Middlewares/LoRaWAN/utilities.d -# Each subdirectory must supply rules for building sources it contributes +# 每个子目录必须为构建它所贡献的源提供规则 Middlewares/LoRaWAN/LmHandler.o: D:/ONEDRIVE/STM32WLV13/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c Middlewares/LoRaWAN/subdir.mk arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Og -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" Middlewares/LoRaWAN/LmhpCompliance.o: D:/ONEDRIVE/STM32WLV13/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c Middlewares/LoRaWAN/subdir.mk diff --git a/STM32CubeIDE/Debug/Middlewares/SubGHz_Phy/subdir.mk b/STM32CubeIDE/Debug/Middlewares/SubGHz_Phy/subdir.mk index 774ac30..d9de20d 100644 --- a/STM32CubeIDE/Debug/Middlewares/SubGHz_Phy/subdir.mk +++ b/STM32CubeIDE/Debug/Middlewares/SubGHz_Phy/subdir.mk @@ -1,9 +1,9 @@ ################################################################################ -# Automatically-generated file. Do not edit! +# 自动生成的文件。不要编辑！ # Toolchain: GNU Tools for STM32 (11.3.rel1) ################################################################################ -# Add inputs and outputs from these tool invocations to the build variables +# 将这些工具调用的输入和输出添加到构建变量 C_SRCS += \ D:/ONEDRIVE/STM32WLV13/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c \ D:/ONEDRIVE/STM32WLV13/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c \ @@ -20,7 +20,7 @@ C_DEPS += \ ./Middlewares/SubGHz_Phy/radio_fw.d -# Each subdirectory must supply rules for building sources it contributes +# 每个子目录必须为构建它所贡献的源提供规则 Middlewares/SubGHz_Phy/radio.o: D:/ONEDRIVE/STM32WLV13/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c Middlewares/SubGHz_Phy/subdir.mk arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Og -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" Middlewares/SubGHz_Phy/radio_driver.o: D:/ONEDRIVE/STM32WLV13/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c Middlewares/SubGHz_Phy/subdir.mk diff --git a/STM32CubeIDE/Debug/Utilities/subdir.mk b/STM32CubeIDE/Debug/Utilities/subdir.mk index 9956469..820e64d 100644 --- a/STM32CubeIDE/Debug/Utilities/subdir.mk +++ b/STM32CubeIDE/Debug/Utilities/subdir.mk @@ -1,9 +1,9 @@ ################################################################################ -# Automatically-generated file. Do not edit! +# 自动生成的文件。不要编辑！ # Toolchain: GNU Tools for STM32 (11.3.rel1) ################################################################################ -# Add inputs and outputs from these tool invocations to the build variables +# 将这些工具调用的输入和输出添加到构建变量 C_SRCS += \ D:/ONEDRIVE/STM32WLV13/Utilities/trace/adv_trace/stm32_adv_trace.c \ D:/ONEDRIVE/STM32WLV13/Utilities/lpm/tiny_lpm/stm32_lpm.c \ @@ -35,7 +35,7 @@ C_DEPS += \ ./Utilities/stm32_tiny_vsnprintf.d -# Each subdirectory must supply rules for building sources it contributes +# 每个子目录必须为构建它所贡献的源提供规则 Utilities/stm32_adv_trace.o: D:/ONEDRIVE/STM32WLV13/Utilities/trace/adv_trace/stm32_adv_trace.c Utilities/subdir.mk arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Og -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" Utilities/stm32_lpm.o: D:/ONEDRIVE/STM32WLV13/Utilities/lpm/tiny_lpm/stm32_lpm.c Utilities/subdir.mk diff --git a/STM32CubeIDE/Debug/makefile b/STM32CubeIDE/Debug/makefile index ec7b3ce..a593a54 100644 --- a/STM32CubeIDE/Debug/makefile +++ b/STM32CubeIDE/Debug/makefile @@ -1,5 +1,5 @@ ################################################################################ -# Automatically-generated file. Do not edit! +# 自动生成的文件。不要编辑！ # Toolchain: GNU Tools for STM32 (11.3.rel1) ################################################################################ @@ -7,7 +7,7 @@ RM := rm -rf -# All of the sources participating in the build are defined here +# 此处定义了参与生成的所有源 -include sources.mk -include Utilities/subdir.mk -include Middlewares/SubGHz_Phy/subdir.mk @@ -43,50 +43,50 @@ $(wildcard ../makefile.init) \ $(wildcard ../makefile.targets) \ -BUILD_ARTIFACT_NAME := ThermalGraph_POC_WL55JC +BUILD_ARTIFACT_NAME := STS-TMG BUILD_ARTIFACT_EXTENSION := elf BUILD_ARTIFACT_PREFIX := BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ARTIFACT_EXTENSION),.$(BUILD_ARTIFACT_EXTENSION),) -# Add inputs and outputs from these tool invocations to the build variables +# 将这些工具调用的输入和输出添加到构建变量 EXECUTABLES += \ -ThermalGraph_POC_WL55JC.elf \ +STS-TMG.elf \ MAP_FILES += \ -ThermalGraph_POC_WL55JC.map \ +STS-TMG.map \ SIZE_OUTPUT += \ default.size.stdout \ OBJDUMP_LIST += \ -ThermalGraph_POC_WL55JC.list \ +STS-TMG.list \ -# All Target +# 所有目标 all: main-build -# Main-build Target -main-build: ThermalGraph_POC_WL55JC.elf secondary-outputs +# 主构建目标 +main-build: STS-TMG.elf secondary-outputs -# Tool invocations -ThermalGraph_POC_WL55JC.elf ThermalGraph_POC_WL55JC.map: $(OBJS) $(USER_OBJS) D:\OneDrive\STM32WLV13\Projects\NUCLEO-WL55JC\Applications\LoRaWAN\ThermalGraph_POC_WL55JC\STM32CubeIDE\STM32WL55JCIX_FLASH.ld makefile objects.list $(OPTIONAL_TOOL_DEPS) - arm-none-eabi-gcc -o "ThermalGraph_POC_WL55JC.elf" @"objects.list" $(USER_OBJS) $(LIBS) -mcpu=cortex-m4 -T"D:\OneDrive\STM32WLV13\Projects\NUCLEO-WL55JC\Applications\LoRaWAN\ThermalGraph_POC_WL55JC\STM32CubeIDE\STM32WL55JCIX_FLASH.ld" --specs=nosys.specs -Wl,-Map="ThermalGraph_POC_WL55JC.map" -Wl,--gc-sections -static --specs=nano.specs -mfloat-abi=soft -mthumb -Wl,--start-group -lc -lm -Wl,--end-group - @echo 'Finished building target: $@' +# 工具调用 +STS-TMG.elf STS-TMG.map: $(OBJS) $(USER_OBJS) D:\ONEDRIVE\STM32WLV13\Projects\NUCLEO-WL55JC\Applications\LoRaWAN\ThermalGraph_POC_WL55JC\STM32CubeIDE\STM32WL55JCIX_FLASH.ld makefile objects.list $(OPTIONAL_TOOL_DEPS) + arm-none-eabi-gcc -o "STS-TMG.elf" @"objects.list" $(USER_OBJS) $(LIBS) -mcpu=cortex-m4 -T"D:\ONEDRIVE\STM32WLV13\Projects\NUCLEO-WL55JC\Applications\LoRaWAN\ThermalGraph_POC_WL55JC\STM32CubeIDE\STM32WL55JCIX_FLASH.ld" --specs=nosys.specs -Wl,-Map="STS-TMG.map" -Wl,--gc-sections -static --specs=nano.specs -mfloat-abi=soft -mthumb -Wl,--start-group -lc -lm -Wl,--end-group + @echo '已结束构建目标： $@' @echo ' ' default.size.stdout: $(EXECUTABLES) makefile objects.list $(OPTIONAL_TOOL_DEPS) arm-none-eabi-size $(EXECUTABLES) - @echo 'Finished building: $@' + @echo '已结束构建： $@' @echo ' ' -ThermalGraph_POC_WL55JC.list: $(EXECUTABLES) makefile objects.list $(OPTIONAL_TOOL_DEPS) - arm-none-eabi-objdump -h -S $(EXECUTABLES) > "ThermalGraph_POC_WL55JC.list" - @echo 'Finished building: $@' +STS-TMG.list: $(EXECUTABLES) makefile objects.list $(OPTIONAL_TOOL_DEPS) + arm-none-eabi-objdump -h -S $(EXECUTABLES) > "STS-TMG.list" + @echo '已结束构建： $@' @echo ' ' -# Other Targets +# 其他目标 clean: - -$(RM) ThermalGraph_POC_WL55JC.elf ThermalGraph_POC_WL55JC.list ThermalGraph_POC_WL55JC.map default.size.stdout + -$(RM) STS-TMG.elf STS-TMG.list STS-TMG.map default.size.stdout -@echo ' ' secondary-outputs: $(SIZE_OUTPUT) $(OBJDUMP_LIST) diff --git a/STM32CubeIDE/Debug/objects.mk b/STM32CubeIDE/Debug/objects.mk index 5e6c2bd..652fea3 100644 --- a/STM32CubeIDE/Debug/objects.mk +++ b/STM32CubeIDE/Debug/objects.mk @@ -1,5 +1,5 @@ ################################################################################ -# Automatically-generated file. Do not edit! +# 自动生成的文件。不要编辑！ # Toolchain: GNU Tools for STM32 (11.3.rel1) ################################################################################ diff --git a/STM32CubeIDE/Debug/sources.mk b/STM32CubeIDE/Debug/sources.mk index 0070fc1..2473b53 100644 --- a/STM32CubeIDE/Debug/sources.mk +++ b/STM32CubeIDE/Debug/sources.mk @@ -1,5 +1,5 @@ ################################################################################ -# Automatically-generated file. Do not edit! +# 自动生成的文件。不要编辑！ # Toolchain: GNU Tools for STM32 (11.3.rel1) ################################################################################ @@ -20,7 +20,7 @@ S_DEPS := S_UPPER_DEPS := C_DEPS := -# Every subdirectory with source files must be described here +# 此处必须描述包含源文件的每个子目录 SUBDIRS := \ Application/User/Core \ Application/User/LoRaWAN/App \ diff --git a/mlx90640/mlx90640_lcd_display.c b/mlx90640/mlx90640_lcd_display.c index 2d799a7..56c84df 100644 --- a/mlx90640/mlx90640_lcd_display.c +++ b/mlx90640/mlx90640_lcd_display.c @@ -282,7 +282,7 @@ void mlx90640_display_process(void) // BSP_LCD_DisplayOff(); } - APP_LOG(TS_OFF, VLEVEL_L, "Water Spill Detected Level = %d of %d, \r\n", waterSpillCount, 30*20); + //APP_LOG(TS_OFF, VLEVEL_L, "Water Spill Detected Level = %d of %d, \r\n", waterSpillCount, 30*20); } void mlx90640_display_init(void){ diff --git a/mlx90640/st7789.c b/mlx90640/st7789.c index 031741a..a25f281 100644 --- a/mlx90640/st7789.c +++ b/mlx90640/st7789.c @@ -217,9 +217,9 @@ void st7789v_DisplayOn(void) LCD_Delay(10); LCD_IO_WriteReg(0x29);/* Display on: DISPON */ LCD_Delay(10); - LCD_IO_WriteReg(0x36);/* Memory data access control: MADCTL */ - data = 0xC0; - LCD_IO_WriteMultipleData(&data, 1); +// LCD_IO_WriteReg(0x36);/* Memory data access control: MADCTL */ +// data = 0xC0; +// LCD_IO_WriteMultipleData(&data, 1); } /** @@ -234,9 +234,9 @@ void st7789v_DisplayOff(void) LCD_Delay(10); LCD_IO_WriteReg(0x28);/* Display off: DISPOFF */ LCD_Delay(10); - LCD_IO_WriteReg(0x36);/* Memory data access control: MADCTL */ - data = 0xC0; - LCD_IO_WriteMultipleData(&data, 1); + //LCD_IO_WriteReg(0x36);/* Memory data access control: MADCTL */ + //data = 0xC0; + //LCD_IO_WriteMultipleData(&data, 1); } /** diff --git a/mlx90640/stm32_hx8347d_lcd.c b/mlx90640/stm32_hx8347d_lcd.c index d77e15e..9502c3b 100644 --- a/mlx90640/stm32_hx8347d_lcd.c +++ b/mlx90640/stm32_hx8347d_lcd.c @@ -155,7 +155,7 @@ uint8_t BSP_LCD_Init(void) // lcd_drv = &hx8347d_drv; lcd_drv = &st7789v_drv; - //LCD_IO_Init(); + LCD_IO_Init(); /* LCD Init */ lcd_drv->Init(); lcd_drv->SetRotation(0); @@ -1221,6 +1221,10 @@ void LCD_IO_Init(void) LCD_CS_HIGH(); LCD_DC_HIGH(); LCD_RST_HIGH(); + LCD_BL_ON(); + + HAL_Delay(200); + /* LCD SPI Config */ //SPIx_Init(); @@ -1241,9 +1245,11 @@ void LCD_IO_WriteReg(uint8_t LCDReg) /* Send Command */ SPIx_Write(LCDReg); + + //LCD_DC_HIGH(); HAL_Delay(1); - LCD_DC_HIGH(); + /* Deselect : Chip Select high */ LCD_CS_HIGH(); @@ -1259,7 +1265,7 @@ uint16_t LCD_IO_ReadData(uint16_t LCDReg){ LCD_CS_LOW(); /* Set LCD data/command line DC to Low */ - //LCD_DC_LOW(); + LCD_DC_LOW(); /* Send Command */ uint16_t data = SPIx_Read(LCDReg); @@ -1340,6 +1346,7 @@ void LCD_Delay(uint32_t Delay) void BSP_LCD_Test(void) { char dspbuf1[]="SmarToilets", dspbuf2[]="Yunhorn Technology"; + LCD_BL_ON(); APP_LOG(TS_OFF,VLEVEL_L,"\r\n Clear with rainbow...........\r\n"); BSP_LCD_FillRect(0,0,ST7789V_LCD_PIXEL_WIDTH,ST7789V_LCD_PIXEL_HEIGHT/7,LCD_COLOR_RED); BSP_LCD_FillRect(0,1*ST7789V_LCD_PIXEL_HEIGHT/7,ST7789V_LCD_PIXEL_WIDTH,ST7789V_LCD_PIXEL_HEIGHT/7,LCD_COLOR_GREEN); @@ -1355,7 +1362,7 @@ void BSP_LCD_Test(void) BSP_LCD_DisplayStringAt(10, 20+3*ST7789V_LCD_PIXEL_HEIGHT/7,(void *)dspbuf2, LEFT_MODE, LCD_COLOR_BLUE); HAL_Delay(2500); -#if 0 +#if 1 BSP_LCD_FillRect(0,0,ST7789V_LCD_PIXEL_WIDTH,ST7789V_LCD_PIXEL_HEIGHT,LCD_COLOR_WHITE); HAL_Delay(500); BSP_LCD_FillRect(0,0,ST7789V_LCD_PIXEL_WIDTH,ST7789V_LCD_PIXEL_HEIGHT,LCD_COLOR_RED); @@ -1369,7 +1376,7 @@ void BSP_LCD_Test(void) HAL_Delay(500); BSP_LCD_FillRect(0,0,ST7789V_LCD_PIXEL_WIDTH,ST7789V_LCD_PIXEL_HEIGHT,LCD_COLOR_BLUE); #endif -#if 0 +#if 1 BSP_LCD_DisplayStringAt(10, 20, "Speed Test", LEFT_MODE, LCD_COLOR_RED); APP_LOG(TS_OFF,VLEVEL_L,"\r\n Speed Test..........."); @@ -1387,7 +1394,7 @@ void BSP_LCD_Test(void) BSP_LCD_Clear(LCD_COLOR_WHITE); BSP_LCD_Clear(LCD_COLOR_BLACK); #endif -#if 0 +#if 1 APP_LOG(TS_OFF,VLEVEL_L,"\r\n Font and Hellow world Test..........."); BSP_LCD_DisplayStringAt(10, 10, "Font test.", LEFT_MODE, LCD_COLOR_RED); BSP_LCD_DisplayStringAt(10, 50, "Hello World!", LEFT_MODE, LCD_COLOR_RED);