From 34c035cf170228a60a71863db6e99f0d0938542a Mon Sep 17 00:00:00 2001 From: a1012112796 <1012112796@qq.com> Date: Sat, 17 Dec 2022 10:57:20 +0800 Subject: [PATCH] =?UTF-8?q?mdk=20=E5=B7=A5=E7=A8=8B=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: a1012112796 <1012112796@qq.com> --- project.uvoptx | 308 ++++++++++++++++++++++++++---------------------- project.uvprojx | 232 +++++++++++++++++++----------------- 2 files changed, 287 insertions(+), 253 deletions(-) diff --git a/project.uvoptx b/project.uvoptx index f21da4f..18fcc41 100644 --- a/project.uvoptx +++ b/project.uvoptx @@ -303,8 +303,8 @@ 0 0 0 - rt-thread\components\libc\cplusplus\cxx_Mutex.cpp - cxx_Mutex.cpp + rt-thread\components\libc\cplusplus\cxx_Semaphore.cpp + cxx_Semaphore.cpp 0 0 @@ -315,26 +315,14 @@ 0 0 0 - rt-thread\components\libc\cplusplus\cxx_crt.cpp - cxx_crt.cpp + rt-thread\components\libc\cplusplus\cxx_Thread.cpp + cxx_Thread.cpp 0 0 2 11 - 8 - 0 - 0 - 0 - rt-thread\components\libc\cplusplus\cxx_Semaphore.cpp - cxx_Semaphore.cpp - 0 - 0 - - - 2 - 12 1 0 0 @@ -344,6 +332,18 @@ 0 0 + + 2 + 12 + 8 + 0 + 0 + 0 + rt-thread\components\libc\cplusplus\cxx_crt.cpp + cxx_crt.cpp + 0 + 0 + 2 13 @@ -351,8 +351,8 @@ 0 0 0 - rt-thread\components\libc\cplusplus\cxx_Thread.cpp - cxx_Thread.cpp + rt-thread\components\libc\cplusplus\cxx_Mutex.cpp + cxx_Mutex.cpp 0 0 @@ -683,8 +683,8 @@ 0 0 0 - rt-thread\components\fal\src\fal_flash.c - fal_flash.c + rt-thread\components\fal\src\fal.c + fal.c 0 0 @@ -695,8 +695,8 @@ 0 0 0 - rt-thread\components\fal\src\fal_rtt.c - fal_rtt.c + rt-thread\components\fal\src\fal_flash.c + fal_flash.c 0 0 @@ -707,8 +707,8 @@ 0 0 0 - rt-thread\components\fal\src\fal.c - fal.c + rt-thread\components\fal\src\fal_rtt.c + fal_rtt.c 0 0 @@ -763,8 +763,8 @@ 0 0 0 - rt-thread\components\finsh\cmd.c - cmd.c + rt-thread\components\finsh\msh_parse.c + msh_parse.c 0 0 @@ -775,8 +775,8 @@ 0 0 0 - rt-thread\components\finsh\msh_parse.c - msh_parse.c + rt-thread\components\finsh\cmd.c + cmd.c 0 0 @@ -979,8 +979,8 @@ 0 0 0 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cec.c - stm32f4xx_hal_cec.c + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash_ex.c + stm32f4xx_hal_flash_ex.c 0 0 @@ -991,8 +991,8 @@ 0 0 0 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr.c - stm32f4xx_hal_pwr.c + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_uart.c + stm32f4xx_hal_uart.c 0 0 @@ -1003,23 +1003,23 @@ 0 0 0 + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc_ex.c + stm32f4xx_hal_rcc_ex.c + 0 + 0 + + + 10 + 63 + 1 + 0 + 0 + 0 libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_crc.c stm32f4xx_hal_crc.c 0 0 - - 10 - 63 - 1 - 0 - 0 - 0 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash_ramfunc.c - stm32f4xx_hal_flash_ramfunc.c - 0 - 0 - 10 64 @@ -1027,66 +1027,6 @@ 0 0 0 - libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\system_stm32f4xx.c - system_stm32f4xx.c - 0 - 0 - - - 10 - 65 - 1 - 0 - 0 - 0 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp.c - stm32f4xx_hal_cryp.c - 0 - 0 - - - 10 - 66 - 1 - 0 - 0 - 0 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cortex.c - stm32f4xx_hal_cortex.c - 0 - 0 - - - 10 - 67 - 1 - 0 - 0 - 0 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal.c - stm32f4xx_hal.c - 0 - 0 - - - 10 - 68 - 1 - 0 - 0 - 0 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c - stm32f4xx_hal_gpio.c - 0 - 0 - - - 10 - 69 - 1 - 0 - 0 - 0 libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp_ex.c stm32f4xx_hal_cryp_ex.c 0 @@ -1094,7 +1034,19 @@ 10 - 70 + 65 + 1 + 0 + 0 + 0 + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr_ex.c + stm32f4xx_hal_pwr_ex.c + 0 + 0 + + + 10 + 66 1 0 0 @@ -1106,7 +1058,43 @@ 10 - 71 + 67 + 1 + 0 + 0 + 0 + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_usart.c + stm32f4xx_hal_usart.c + 0 + 0 + + + 10 + 68 + 1 + 0 + 0 + 0 + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr.c + stm32f4xx_hal_pwr.c + 0 + 0 + + + 10 + 69 + 1 + 0 + 0 + 0 + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_iwdg.c + stm32f4xx_hal_iwdg.c + 0 + 0 + + + 10 + 70 1 0 0 @@ -1116,6 +1104,18 @@ 0 0 + + 10 + 71 + 1 + 0 + 0 + 0 + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma_ex.c + stm32f4xx_hal_dma_ex.c + 0 + 0 + 10 72 @@ -1123,23 +1123,23 @@ 0 0 0 + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c + stm32f4xx_hal_gpio.c + 0 + 0 + + + 10 + 73 + 1 + 0 + 0 + 0 libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rng.c stm32f4xx_hal_rng.c 0 0 - - 10 - 73 - 1 - 0 - 0 - 0 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash_ex.c - stm32f4xx_hal_flash_ex.c - 0 - 0 - 10 74 @@ -1147,8 +1147,8 @@ 0 0 0 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc_ex.c - stm32f4xx_hal_rcc_ex.c + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cortex.c + stm32f4xx_hal_cortex.c 0 0 @@ -1171,8 +1171,8 @@ 0 0 0 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_uart.c - stm32f4xx_hal_uart.c + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp.c + stm32f4xx_hal_cryp.c 0 0 @@ -1183,8 +1183,8 @@ 0 0 0 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash.c - stm32f4xx_hal_flash.c + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash_ramfunc.c + stm32f4xx_hal_flash_ramfunc.c 0 0 @@ -1195,23 +1195,23 @@ 0 0 0 + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal.c + stm32f4xx_hal.c + 0 + 0 + + + 10 + 79 + 1 + 0 + 0 + 0 libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_wwdg.c stm32f4xx_hal_wwdg.c 0 0 - - 10 - 79 - 1 - 0 - 0 - 0 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_iwdg.c - stm32f4xx_hal_iwdg.c - 0 - 0 - 10 80 @@ -1219,8 +1219,8 @@ 0 0 0 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma_ex.c - stm32f4xx_hal_dma_ex.c + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cec.c + stm32f4xx_hal_cec.c 0 0 @@ -1231,8 +1231,8 @@ 0 0 0 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr_ex.c - stm32f4xx_hal_pwr_ex.c + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash.c + stm32f4xx_hal_flash.c 0 0 @@ -1243,8 +1243,8 @@ 0 0 0 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_usart.c - stm32f4xx_hal_usart.c + libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\system_stm32f4xx.c + system_stm32f4xx.c 0 0 @@ -1263,6 +1263,30 @@ 0 0 0 + rt-thread\components\utilities\ulog\backend\console_be.c + console_be.c + 0 + 0 + + + 11 + 84 + 1 + 0 + 0 + 0 + rt-thread\components\utilities\ulog\ulog.c + ulog.c + 0 + 0 + + + 11 + 85 + 1 + 0 + 0 + 0 rt-thread\components\utilities\ymodem\ymodem.c ymodem.c 0 diff --git a/project.uvprojx b/project.uvprojx index c7acaf4..476cd49 100644 --- a/project.uvprojx +++ b/project.uvprojx @@ -10,7 +10,7 @@ rt-thread 0x4 ARM-ADS - 5060960::V5.06 update 7 (build 960)::.\ARMCC + 5060750::V5.06 update 6 (build 750)::ARMCC 0 @@ -337,9 +337,9 @@ 0 - __CLK_TCK=RT_TICK_PER_SECOND, STM32F413xx, USE_HAL_DRIVER, RT_USING_ARM_LIBC, RT_USING_LIBC, __RTTHREAD__, __STDC_LIMIT_MACROS + __STDC_LIMIT_MACROS, STM32F413xx, USE_HAL_DRIVER, RT_USING_LIBC, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, RT_USING_ARM_LIBC - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;rt-thread\components\libc\compilers\common\include;rt-thread\components\libc\posix\ipc;libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;board\CubeMX_Config\Inc;rt-thread\components\libc\posix\io\stdio;board;rt-thread\components\drivers\include;rt-thread\components\drivers\include;libraries\HAL_Drivers;rt-thread\components\fal\inc;rt-thread\components\drivers\include;rt-thread\libcpu\arm\common;rt-thread\components\drivers\include;libraries\HAL_Drivers\CMSIS\Include;rt-thread\include;.;rt-thread\components\finsh;libraries\HAL_Drivers\config;rt-thread\components\libc\compilers\common\extension;rt-thread\components\drivers\include;rt-thread\components\utilities\ymodem;libraries\HAL_Drivers\drv_flash;rt-thread\components\libc\cplusplus;rt-thread\components\libc\posix\io\poll;rt-thread\components\libc\compilers\common\extension\fcntl\octal;rt-thread\libcpu\arm\cortex-m4;iap + rt-thread\components\drivers\include;rt-thread\components\libc\posix\io\poll;rt-thread\components\drivers\include;libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;rt-thread\components\utilities\ulog;.;board\CubeMX_Config\Inc;rt-thread\components\libc\posix\ipc;libraries\HAL_Drivers\drv_flash;libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;rt-thread\components\libc\compilers\common\include;libraries\HAL_Drivers;rt-thread\components\drivers\include;rt-thread\components\libc\compilers\common\extension\fcntl\octal;board;rt-thread\components\libc\posix\io\stdio;rt-thread\libcpu\arm\common;rt-thread\components\drivers\include;rt-thread\include;iap;rt-thread\components\fal\inc;rt-thread\components\utilities\ymodem;rt-thread\components\libc\compilers\common\extension;libraries\HAL_Drivers\config;rt-thread\components\finsh;rt-thread\libcpu\arm\cortex-m4;rt-thread\components\drivers\include;libraries\HAL_Drivers\CMSIS\Include;rt-thread\components\libc\cplusplus @@ -428,30 +428,30 @@ CPlusPlus - - cxx_Mutex.cpp - 8 - rt-thread\components\libc\cplusplus\cxx_Mutex.cpp - - - cxx_crt.cpp - 8 - rt-thread\components\libc\cplusplus\cxx_crt.cpp - cxx_Semaphore.cpp 8 rt-thread\components\libc\cplusplus\cxx_Semaphore.cpp + + cxx_Thread.cpp + 8 + rt-thread\components\libc\cplusplus\cxx_Thread.cpp + cxx_crt_init.c 1 rt-thread\components\libc\cplusplus\cxx_crt_init.c - cxx_Thread.cpp + cxx_crt.cpp 8 - rt-thread\components\libc\cplusplus\cxx_Thread.cpp + rt-thread\components\libc\cplusplus\cxx_crt.cpp + + + cxx_Mutex.cpp + 8 + rt-thread\components\libc\cplusplus\cxx_Mutex.cpp @@ -593,6 +593,11 @@ Fal + + fal.c + 1 + rt-thread\components\fal\src\fal.c + fal_flash.c 1 @@ -603,11 +608,6 @@ 1 rt-thread\components\fal\src\fal_rtt.c - - fal.c - 1 - rt-thread\components\fal\src\fal.c - fal_partition.c 1 @@ -628,16 +628,16 @@ 1 rt-thread\components\finsh\msh.c - - cmd.c - 1 - rt-thread\components\finsh\cmd.c - msh_parse.c 1 rt-thread\components\finsh\msh_parse.c + + cmd.c + 1 + rt-thread\components\finsh\cmd.c + @@ -723,126 +723,136 @@ Libraries - - stm32f4xx_hal_cec.c - 1 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cec.c - - - stm32f4xx_hal_pwr.c - 1 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr.c - - - stm32f4xx_hal_crc.c - 1 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_crc.c - - - stm32f4xx_hal_flash_ramfunc.c - 1 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash_ramfunc.c - - - system_stm32f4xx.c - 1 - libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\system_stm32f4xx.c - - - stm32f4xx_hal_cryp.c - 1 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp.c - - - stm32f4xx_hal_cortex.c - 1 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cortex.c - - - stm32f4xx_hal.c - 1 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal.c - - - stm32f4xx_hal_gpio.c - 1 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c - - - stm32f4xx_hal_cryp_ex.c - 1 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp_ex.c - - - stm32f4xx_hal_dma.c - 1 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma.c - - - stm32f4xx_hal_rcc.c - 1 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc.c - - - stm32f4xx_hal_rng.c - 1 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rng.c - stm32f4xx_hal_flash_ex.c 1 libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash_ex.c - - stm32f4xx_hal_rcc_ex.c - 1 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc_ex.c - - - stm32f4xx_hal_can.c - 1 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_can.c - stm32f4xx_hal_uart.c 1 libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_uart.c - stm32f4xx_hal_flash.c + stm32f4xx_hal_rcc_ex.c 1 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash.c + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc_ex.c - stm32f4xx_hal_wwdg.c + stm32f4xx_hal_crc.c 1 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_wwdg.c + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_crc.c - stm32f4xx_hal_iwdg.c + stm32f4xx_hal_cryp_ex.c 1 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_iwdg.c - - - stm32f4xx_hal_dma_ex.c - 1 - libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma_ex.c + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp_ex.c stm32f4xx_hal_pwr_ex.c 1 libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr_ex.c + + stm32f4xx_hal_dma.c + 1 + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma.c + stm32f4xx_hal_usart.c 1 libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_usart.c + + stm32f4xx_hal_pwr.c + 1 + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr.c + + + stm32f4xx_hal_iwdg.c + 1 + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_iwdg.c + + + stm32f4xx_hal_rcc.c + 1 + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc.c + + + stm32f4xx_hal_dma_ex.c + 1 + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma_ex.c + + + stm32f4xx_hal_gpio.c + 1 + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c + + + stm32f4xx_hal_rng.c + 1 + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rng.c + + + stm32f4xx_hal_cortex.c + 1 + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cortex.c + + + stm32f4xx_hal_can.c + 1 + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_can.c + + + stm32f4xx_hal_cryp.c + 1 + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp.c + + + stm32f4xx_hal_flash_ramfunc.c + 1 + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash_ramfunc.c + + + stm32f4xx_hal.c + 1 + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal.c + + + stm32f4xx_hal_wwdg.c + 1 + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_wwdg.c + + + stm32f4xx_hal_cec.c + 1 + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cec.c + + + stm32f4xx_hal_flash.c + 1 + libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash.c + + + system_stm32f4xx.c + 1 + libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\system_stm32f4xx.c + Utilities + + console_be.c + 1 + rt-thread\components\utilities\ulog\backend\console_be.c + + + ulog.c + 1 + rt-thread\components\utilities\ulog\ulog.c + ymodem.c 1