From f458c0d0feae0ff0a6806525a418c44fe8a1b712 Mon Sep 17 00:00:00 2001 From: YunHorn Technology Date: Tue, 8 Aug 2023 12:14:12 +0800 Subject: [PATCH] restore i2c settings --- Core/Inc/main.h | 6 -- Core/Src/main.c | 81 ++++++++++++++++++- STM32CubeIDE/.settings/language.settings.xml | 4 +- .../Release/Application/User/Core/subdir.mk | 6 +- .../Application/User/LoRaWAN/App/subdir.mk | 6 +- .../Application/User/LoRaWAN/Target/subdir.mk | 6 +- .../Application/User/Startup/subdir.mk | 6 +- .../Drivers/BSP/STM32WLxx_Nucleo/subdir.mk | 6 +- STM32CubeIDE/Release/Drivers/CMSIS/subdir.mk | 6 +- .../Drivers/STM32WLxx_HAL_Driver/subdir.mk | 6 +- .../Release/Middlewares/LoRaWAN/subdir.mk | 6 +- .../Release/Middlewares/SubGHz_Phy/subdir.mk | 6 +- STM32CubeIDE/Release/Utilities/subdir.mk | 6 +- STM32CubeIDE/Release/makefile | 40 ++++----- STM32CubeIDE/Release/objects.mk | 2 +- STM32CubeIDE/Release/sources.mk | 4 +- mlx90640/MLX90640_I2C_Driver.c | 4 +- mlx90640/mlx90640_lcd_display.c | 22 +++-- mlx90640/stm32_hx8347d_lcd.c | 14 +--- 19 files changed, 154 insertions(+), 83 deletions(-) diff --git a/Core/Inc/main.h b/Core/Inc/main.h index 0a21b66..d269bbf 100644 --- a/Core/Inc/main.h +++ b/Core/Inc/main.h @@ -107,12 +107,6 @@ void Error_Handler(void); #define LCD_TE_GPIO_Port GPIOB #endif -#define FPS2HZ 0x02 -#define FPS4HZ 0x03 -#define FPS8HZ 0x04 -#define FPS16HZ 0x05 -#define FPS32HZ 0x06 - #define KEY1_Pin GPIO_PIN_0 #define KEY1_GPIO_Port GPIOA #define KEY2_Pin GPIO_PIN_1 diff --git a/Core/Src/main.c b/Core/Src/main.c index d58e8ba..5c8c48b 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -147,12 +147,21 @@ int main(void) //BSP_LCD_DisplayOff(); BSP_LCD_Test(); - APP_LOG(TS_OFF, VLEVEL_L, "START Thermal Graph Test....\r\n"); - MLX90640_I2CInit(); mlx90640_display_init(); +#if 0 + APP_LOG(TS_OFF, VLEVEL_L, "DISPLAY ON....\r\n"); + BSP_LCD_DisplayOn(); + BSP_LCD_Clear(LCD_COLOR_YELLOW); + APP_LOG(TS_OFF, VLEVEL_L, "WIDTH = %d, HEIGHT =%d \r\n", BSP_LCD_GetXSize(), BSP_LCD_GetYSize()); + BSP_LCD_DisplayStringAt(45,45,"SmarToilets",LEFT_MODE,LCD_COLOR_BLUE); + APP_LOG(TS_OFF, VLEVEL_L, "WIDTH = %d, HEIGHT =%d \r\n", BSP_LCD_GetXSize(), BSP_LCD_GetYSize()); + BSP_LCD_DisplayStringAt(45,45,"SmarToilets",LEFT_MODE,LCD_COLOR_RED); + APP_LOG(TS_OFF, VLEVEL_L, "DISPLAY LOGO....\r\n"); + BSP_LCD_DisplayStringAt(45,45,"SmarToilets",LEFT_MODE,LCD_COLOR_BLUE); +#endif while (1) { /* USER CODE END WHILE */ @@ -162,7 +171,75 @@ int main(void) mlx90640_display_process(); } //HAL_TIM_PWM_Start(&htim3,TIM_CHANNEL_1); +#if 0 + ST7789_Init(); + APP_LOG(TS_OFF,VLEVEL_L,"\r\n Set Black Light...on...."); + ST7789_SetBackLight(1); + ST7789_Test(); + ST7789_SetBackLight(1); + //bmp_header_init(&bmpinfo); + //HAL_TIM_Base_Start_IT(&htim4); + //HAL_TIM_Encoder_Start(&htim2,TIM_CHANNEL_ALL); + //HAL_ADC_Start_DMA(&hadc,voltage_adc,1); + + mlx90640_init(FPS2HZ,&mlx90640); + my_menu.chose_color_method_index=0; + + while (1) + { + /* USER CODE END WHILE */ + + /* USER CODE BEGIN 3 */ + + APP_LOG(TS_OFF,VLEVEL_L,"\r\nGet Raw data \r\n"); + + mlx90640_get_temp_mat(&mlx90640,mlx90640To); + APP_LOG(TS_OFF,VLEVEL_L,"\r\nSet backlight 1 \r\n"); + ST7789_SetBackLight(1); + + chose_menu_index =0; + my_menu.chose_color_method_index = chose_menu_index; + my_menu.chose_color_method_index++; + APP_LOG(TS_OFF,VLEVEL_L,"\r\n Set Method %u \r\n", (uint8_t)(img_method_arr[my_menu.chose_color_method_index])); + mlx90640_get_temp_mat(&mlx90640,mlx90640To); + draw_spectrum(img_method_arr[my_menu.chose_color_method_index]); + HAL_Delay(2000); + + my_menu.chose_color_method_index++; + APP_LOG(TS_OFF,VLEVEL_L,"\r\n Set Method %u \r\n", (uint8_t)(img_method_arr[my_menu.chose_color_method_index])); + draw_spectrum(img_method_arr[my_menu.chose_color_method_index]); + HAL_Delay(2000); + + my_menu.chose_color_method_index++; + APP_LOG(TS_OFF,VLEVEL_L,"\r\n Set Method %u \r\n", (uint8_t)(img_method_arr[my_menu.chose_color_method_index])); + draw_spectrum(img_method_arr[my_menu.chose_color_method_index]); + HAL_Delay(2000); + + my_menu.chose_color_method_index++; + APP_LOG(TS_OFF,VLEVEL_L,"\r\n Set Method %u \r\n", (uint8_t)(img_method_arr[my_menu.chose_color_method_index])); + draw_spectrum(img_method_arr[my_menu.chose_color_method_index]); + HAL_Delay(2000); + + APP_LOG(TS_OFF,VLEVEL_L,"\r\n"); + for (int i=0; i< 24; i++) + { + APP_LOG(TS_OFF,VLEVEL_L,"\r\n"); + for (int j=0; j < 32; j++) { + sprintf(buf,"%.1f", (float)(mlx90640To[j*i])); + APP_LOG(TS_OFF,VLEVEL_L,"%s ", buf); + } + HAL_Delay(2); + } + + while(temp_to_bmp8(bmp8,mlx90640To,768,&max_temp,&min_temp,1)) + {//温度异常重新获取 + mlx90640_get_temp_mat(&mlx90640,mlx90640To); + } + sprintf(buf,"\r\n\nMax=%.2f, Min=%.2f, Center=%.2f\n",(float)max_temp, (float)min_temp, (float)mlx90640To[768/2]); + APP_LOG(TS_OFF,VLEVEL_L,"%s\r\n", buf); + } +#endif /* USER CODE END 2 */ /* Infinite loop */ diff --git a/STM32CubeIDE/.settings/language.settings.xml b/STM32CubeIDE/.settings/language.settings.xml index 65a8ff2..664f682 100644 --- a/STM32CubeIDE/.settings/language.settings.xml +++ b/STM32CubeIDE/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/STM32CubeIDE/Release/Application/User/Core/subdir.mk b/STM32CubeIDE/Release/Application/User/Core/subdir.mk index 0e7c929..0c750fa 100644 --- a/STM32CubeIDE/Release/Application/User/Core/subdir.mk +++ b/STM32CubeIDE/Release/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 -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -I../../mlx90640 -I../../user -I../../w25qxx -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/CMSIS/DSP/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -I../../mlx90640/Fonts -I../../hx8347d -I../../hx8347d/Fonts -Os -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/Release/Application/User/LoRaWAN/App/subdir.mk b/STM32CubeIDE/Release/Application/User/LoRaWAN/App/subdir.mk index acae231..3265097 100644 --- a/STM32CubeIDE/Release/Application/User/LoRaWAN/App/subdir.mk +++ b/STM32CubeIDE/Release/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 -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -I../../mlx90640 -I../../user -I../../w25qxx -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/CMSIS/DSP/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -I../../mlx90640/Fonts -I../../hx8347d -I../../hx8347d/Fonts -Os -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/Release/Application/User/LoRaWAN/Target/subdir.mk b/STM32CubeIDE/Release/Application/User/LoRaWAN/Target/subdir.mk index 49d80ce..ab729e1 100644 --- a/STM32CubeIDE/Release/Application/User/LoRaWAN/Target/subdir.mk +++ b/STM32CubeIDE/Release/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 -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -I../../mlx90640 -I../../user -I../../w25qxx -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/CMSIS/DSP/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -I../../mlx90640/Fonts -I../../hx8347d -I../../hx8347d/Fonts -Os -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/Release/Application/User/Startup/subdir.mk b/STM32CubeIDE/Release/Application/User/Startup/subdir.mk index f7f1eb9..516e38d 100644 --- a/STM32CubeIDE/Release/Application/User/Startup/subdir.mk +++ b/STM32CubeIDE/Release/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 -c -x assembler-with-cpp -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" "$<" diff --git a/STM32CubeIDE/Release/Drivers/BSP/STM32WLxx_Nucleo/subdir.mk b/STM32CubeIDE/Release/Drivers/BSP/STM32WLxx_Nucleo/subdir.mk index 281048e..2eab2a8 100644 --- a/STM32CubeIDE/Release/Drivers/BSP/STM32WLxx_Nucleo/subdir.mk +++ b/STM32CubeIDE/Release/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 -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -I../../mlx90640 -I../../user -I../../w25qxx -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/CMSIS/DSP/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -I../../mlx90640/Fonts -I../../hx8347d -I../../hx8347d/Fonts -Os -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/Release/Drivers/CMSIS/subdir.mk b/STM32CubeIDE/Release/Drivers/CMSIS/subdir.mk index 4bdc136..e3bc5e3 100644 --- a/STM32CubeIDE/Release/Drivers/CMSIS/subdir.mk +++ b/STM32CubeIDE/Release/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 -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -I../../mlx90640 -I../../user -I../../w25qxx -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/CMSIS/DSP/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -I../../mlx90640/Fonts -I../../hx8347d -I../../hx8347d/Fonts -Os -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/Release/Drivers/STM32WLxx_HAL_Driver/subdir.mk b/STM32CubeIDE/Release/Drivers/STM32WLxx_HAL_Driver/subdir.mk index acc8c9c..2192958 100644 --- a/STM32CubeIDE/Release/Drivers/STM32WLxx_HAL_Driver/subdir.mk +++ b/STM32CubeIDE/Release/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 -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -I../../mlx90640 -I../../user -I../../w25qxx -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/CMSIS/DSP/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -I../../mlx90640/Fonts -I../../hx8347d -I../../hx8347d/Fonts -Os -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/Release/Middlewares/LoRaWAN/subdir.mk b/STM32CubeIDE/Release/Middlewares/LoRaWAN/subdir.mk index be70e05..5a22d68 100644 --- a/STM32CubeIDE/Release/Middlewares/LoRaWAN/subdir.mk +++ b/STM32CubeIDE/Release/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 -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -I../../mlx90640 -I../../user -I../../w25qxx -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/CMSIS/DSP/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -I../../mlx90640/Fonts -I../../hx8347d -I../../hx8347d/Fonts -Os -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/Release/Middlewares/SubGHz_Phy/subdir.mk b/STM32CubeIDE/Release/Middlewares/SubGHz_Phy/subdir.mk index e21a289..e3a352f 100644 --- a/STM32CubeIDE/Release/Middlewares/SubGHz_Phy/subdir.mk +++ b/STM32CubeIDE/Release/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 -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -I../../mlx90640 -I../../user -I../../w25qxx -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/CMSIS/DSP/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -I../../mlx90640/Fonts -I../../hx8347d -I../../hx8347d/Fonts -Os -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/Release/Utilities/subdir.mk b/STM32CubeIDE/Release/Utilities/subdir.mk index 9961666..466e859 100644 --- a/STM32CubeIDE/Release/Utilities/subdir.mk +++ b/STM32CubeIDE/Release/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 -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -I../../mlx90640 -I../../user -I../../w25qxx -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/CMSIS/DSP/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -I../../mlx90640/Fonts -I../../hx8347d -I../../hx8347d/Fonts -Os -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/Release/makefile b/STM32CubeIDE/Release/makefile index 6305fde..dca2b7b 100644 --- a/STM32CubeIDE/Release/makefile +++ b/STM32CubeIDE/Release/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 -u _printf_float -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 -u _printf_float -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/Release/objects.mk b/STM32CubeIDE/Release/objects.mk index 5e6c2bd..652fea3 100644 --- a/STM32CubeIDE/Release/objects.mk +++ b/STM32CubeIDE/Release/objects.mk @@ -1,5 +1,5 @@ ################################################################################ -# Automatically-generated file. Do not edit! +# 自动生成的文件。不要编辑！ # Toolchain: GNU Tools for STM32 (11.3.rel1) ################################################################################ diff --git a/STM32CubeIDE/Release/sources.mk b/STM32CubeIDE/Release/sources.mk index 0070fc1..2473b53 100644 --- a/STM32CubeIDE/Release/sources.mk +++ b/STM32CubeIDE/Release/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_I2C_Driver.c b/mlx90640/MLX90640_I2C_Driver.c index 2387db5..8e97506 100644 --- a/mlx90640/MLX90640_I2C_Driver.c +++ b/mlx90640/MLX90640_I2C_Driver.c @@ -33,7 +33,7 @@ int MLX90640_I2CRead(uint8_t slaveAddr, uint16_t startAddress, uint16_t nMemAddr int ack = 0; int cnt = 0; - ack = HAL_I2C_Mem_Read(&hi2c2, (slaveAddr<<1), startAddress, I2C_MEMADD_SIZE_16BIT, bp, nMemAddressRead*2, 50); + ack = HAL_I2C_Mem_Read(&hi2c2, (slaveAddr<<1), startAddress, I2C_MEMADD_SIZE_16BIT, bp, nMemAddressRead*2, 500); if (ack != HAL_OK) { @@ -64,7 +64,7 @@ int MLX90640_I2CWrite(uint8_t slaveAddr, uint16_t writeAddress, uint16_t data) cmd[0] = data >> 8; cmd[1] = data & 0x00FF; - ack = HAL_I2C_Mem_Write(&hi2c2, sa, writeAddress, I2C_MEMADD_SIZE_16BIT, cmd, sizeof(cmd), 50); + ack = HAL_I2C_Mem_Write(&hi2c2, sa, writeAddress, I2C_MEMADD_SIZE_16BIT, cmd, sizeof(cmd), 500); if (ack != HAL_OK) { diff --git a/mlx90640/mlx90640_lcd_display.c b/mlx90640/mlx90640_lcd_display.c index d5a345d..1870046 100644 --- a/mlx90640/mlx90640_lcd_display.c +++ b/mlx90640/mlx90640_lcd_display.c @@ -4,7 +4,11 @@ #include "MLX90640_API.h" #include "MLX90640_I2C_Driver.h" #include "sys_app.h" - +#define FPS2HZ 0x02 +#define FPS4HZ 0x03 +#define FPS8HZ 0x04 +#define FPS16HZ 0x05 +#define FPS32HZ 0x06 #define MLX90640_ADDR 0x33 #define RefreshRate FPS8HZ @@ -142,7 +146,7 @@ static void drawMeasurement(void ) { static void drawPicture(void) { for (y=0; y<24; y++) { for (x=0; x<32; x++) { - BSP_LCD_FillRect(x*10, y*11, 10, 11, TempToColor(tempValues[(x) + (y*32)])); + BSP_LCD_FillRect(x*10, y*11, 9, 11, TempToColor(tempValues[(x) + (y*32)])); } } } @@ -167,14 +171,22 @@ static void readTempValues(void) { MLX90640_CalculateTo(mlx90640Frame, &mlx90640, EMMISIVITY, tr, tempValues); } - +#if 0 + APP_LOG(TS_OFF,VLEVEL_L, "\r\n\n\n"); + for (uint8_t y=0; y < 24; y++) { + for (uint8_t x=0; x<32; x++) { + APP_LOG(TS_OFF, VLEVEL_L, "%c ", (uint8_t)((((float)tempValues[y*32+x]- 25.0)) + 0x30)); + } + APP_LOG(TS_OFF,VLEVEL_L, "\r\n"); + } +#endif } void mlx90640_display_process(void){ //APP_LOG(TS_OFF, VLEVEL_L, "Read value.\r\n"); readTempValues(); - setTempScale(); - drawPicture(); + setTempScale(); + drawPicture(); drawMeasurement(); } diff --git a/mlx90640/stm32_hx8347d_lcd.c b/mlx90640/stm32_hx8347d_lcd.c index 7c9a418..7985a95 100644 --- a/mlx90640/stm32_hx8347d_lcd.c +++ b/mlx90640/stm32_hx8347d_lcd.c @@ -1140,7 +1140,6 @@ static void SPIx_Write(uint8_t Value) HAL_StatusTypeDef status = HAL_OK; uint8_t data; - status = HAL_SPI_TransmitReceive(&hspi1, (uint8_t*) &Value, &data, 1, SpixTimeout); /* Check the communication status */ @@ -1276,7 +1275,6 @@ uint16_t LCD_IO_ReadData(uint16_t LCDReg){ void LCD_IO_WriteMultipleData(uint8_t *pData, uint32_t Size) { uint32_t counter = 0; - HAL_StatusTypeDef status = HAL_OK; /* Reset LCD control line CS */ LCD_CS_LOW(); @@ -1292,15 +1290,6 @@ void LCD_IO_WriteMultipleData(uint8_t *pData, uint32_t Size) } else { - while (Size >0) { - uint16_t chunk_size = Size > 65535 ? 65535 : Size; - HAL_SPI_Transmit(&hspi1, pData, chunk_size, HAL_MAX_DELAY); - - pData += chunk_size; - Size -= chunk_size; - /* Check the communication status */ - } -#if 0 /* Several data should be sent in a raw */ /* Direct SPI accesses for optimization */ for (counter = Size; counter != 0; counter--) @@ -1322,8 +1311,7 @@ void LCD_IO_WriteMultipleData(uint8_t *pData, uint32_t Size) /* Wait until the bus is ready before releasing Chip select */ while(((hspi1.Instance->SR) & SPI_FLAG_BSY) != RESET) { - } -#endif + } } /* Deselect : Chip Select high */