From 567085ead3f6adaabd884f16ab4b17c62e8f0403 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期日, 21 十二月 2025 22:28:09 +0800
Subject: [PATCH] OTA升级功能调通，准备增加boot的代码
---
STM32H743/MDK-ARM/STM32H743.uvprojx | 285 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 277 insertions(+), 8 deletions(-)
diff --git a/STM32H743/MDK-ARM/STM32H743.uvprojx b/STM32H743/MDK-ARM/STM32H743.uvprojx
index d637644..9ec12b5 100644
--- a/STM32H743/MDK-ARM/STM32H743.uvprojx
+++ b/STM32H743/MDK-ARM/STM32H743.uvprojx
@@ -16,8 +16,8 @@
<TargetCommonOption>
<Device>STM32H743VITx</Device>
<Vendor>STMicroelectronics</Vendor>
- <PackID>Keil.STM32H7xx_DFP.2.7.0</PackID>
- <PackURL>http://www.keil.com/pack/</PackURL>
+ <PackID>Keil.STM32H7xx_DFP.4.1.3</PackID>
+ <PackURL>https://www.keil.com/pack/</PackURL>
<Cpu>IRAM(0x20000000-0x2001FFFF) IRAM2(0x24000000-0x2407FFFF) IROM(0x8000000-0x81FFFFF) CLOCK(12000000) FPU3(DFPU) CPUTYPE("Cortex-M7") ELITTLE TZ</Cpu>
<FlashUtilSpec></FlashUtilSpec>
<StartupFile></StartupFile>
@@ -328,7 +328,7 @@
<uC99>1</uC99>
<uGnu>1</uGnu>
<useXO>0</useXO>
- <v6Lang>5</v6Lang>
+ <v6Lang>3</v6Lang>
<v6LangP>3</v6LangP>
<vShortEn>1</vShortEn>
<vShortWch>1</vShortWch>
@@ -336,8 +336,8 @@
<v6WtE>0</v6WtE>
<v6Rtti>0</v6Rtti>
<VariousControls>
- <MiscControls></MiscControls>
- <Define>USE_PWR_LDO_SUPPLY,USE_HAL_DRIVER,STM32H743xx,_USE_OS_,_RTK_MODE_,__EC600S__,__APP_CODE__,__USE_UWB__,__USE_NTRIP__</Define>
+ <MiscControls>--fpmode=fast</MiscControls>
+ <Define>USE_PWR_LDO_SUPPLY,USE_HAL_DRIVER,STM32H743xx,_USE_OS_,__TARGET_FPU_VFP</Define>
<Undefine></Undefine>
<IncludePath>../Core/Inc;../Drivers/STM32H7xx_HAL_Driver/Inc;../Drivers/STM32H7xx_HAL_Driver/Inc/Legacy;../Middlewares/Third_Party/FreeRTOS/Source/include;../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2;../Middlewares/Third_Party/FreeRTOS/Source/portable/RVDS/ARM_CM4F;../Drivers/CMSIS/Device/ST/STM32H7xx/Include;../Drivers/CMSIS/Include;../HIDOLibrary/Include;../HAL;../FML;../APL;../FML/Internet;../FML/Internet/Module;../FML/Internet/Module/EG800</IncludePath>
</VariousControls>
@@ -357,7 +357,7 @@
<MiscControls></MiscControls>
<Define></Define>
<Undefine></Undefine>
- <IncludePath>../Core/Inc;../Drivers/STM32H7xx_HAL_Driver/Inc;../Drivers/STM32H7xx_HAL_Driver/Inc/Legacy;../Middlewares/Third_Party/FreeRTOS/Source/include;../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2;../Middlewares/Third_Party/FreeRTOS/Source/portable/RVDS/ARM_CM4F;../Drivers/CMSIS/Device/ST/STM32H7xx/Include;../Drivers/CMSIS/Include</IncludePath>
+ <IncludePath>../Core/Inc;../Drivers/STM32H7xx_HAL_Driver/Inc;../Drivers/STM32H7xx_HAL_Driver/Inc/Legacy;../Middlewares/Third_Party/FreeRTOS/Source/include;../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2;../Middlewares/Third_Party/FreeRTOS/Source/portable/RVDS/ARM_CM4F;../Drivers/CMSIS/Device/ST/STM32H7xx/Include;../Drivers/CMSIS/Include;../Middlewares/ST/ARM/DSP/Inc</IncludePath>
</VariousControls>
</Aads>
<LDads>
@@ -458,6 +458,36 @@
<FileType>1</FileType>
<FilePath>..\APL\TCPClient.c</FilePath>
</File>
+ <File>
+ <FileName>MQTTClient.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\APL\MQTTClient.c</FilePath>
+ </File>
+ <File>
+ <FileName>MsgPack.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\APL\MsgPack.c</FilePath>
+ </File>
+ <File>
+ <FileName>MQTTApp.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\APL\MQTTApp.c</FilePath>
+ </File>
+ <File>
+ <FileName>PathStorage.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\APL\PathStorage.c</FilePath>
+ </File>
+ <File>
+ <FileName>PathTest.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\APL\PathTest.c</FilePath>
+ </File>
+ <File>
+ <FileName>OTAUpgrade.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\APL\OTAUpgrade.c</FilePath>
+ </File>
</Files>
</Group>
<Group>
@@ -523,6 +553,36 @@
<FileType>1</FileType>
<FilePath>..\FML\pwm_ctrol.c</FilePath>
</File>
+ <File>
+ <FileName>SBUS.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\FML\SBUS.c</FilePath>
+ </File>
+ <File>
+ <FileName>PythonLink.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\FML\PythonLink.c</FilePath>
+ </File>
+ <File>
+ <FileName>MQTT.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\FML\Internet\MQTT.c</FilePath>
+ </File>
+ <File>
+ <FileName>EG800MQTT.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\FML\Internet\Module\EG800\EG800MQTT.c</FilePath>
+ </File>
+ <File>
+ <FileName>HTTPClient.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\FML\Internet\HTTPClient.c</FilePath>
+ </File>
+ <File>
+ <FileName>FileDownload.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\APL\FileDownload.c</FilePath>
+ </File>
</Files>
</Group>
<Group>
@@ -559,6 +619,118 @@
<FilePath>../Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_cortex.c</FilePath>
</File>
<File>
+ <FileName>stm32h7xx_hal_crc.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>../Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_crc.c</FilePath>
+ <FileOption>
+ <CommonProperty>
+ <UseCPPCompiler>2</UseCPPCompiler>
+ <RVCTCodeConst>0</RVCTCodeConst>
+ <RVCTZI>0</RVCTZI>
+ <RVCTOtherData>0</RVCTOtherData>
+ <ModuleSelection>0</ModuleSelection>
+ <IncludeInBuild>1</IncludeInBuild>
+ <AlwaysBuild>2</AlwaysBuild>
+ <GenerateAssemblyFile>2</GenerateAssemblyFile>
+ <AssembleAssemblyFile>2</AssembleAssemblyFile>
+ <PublicsOnly>2</PublicsOnly>
+ <StopOnExitCode>11</StopOnExitCode>
+ <CustomArgument></CustomArgument>
+ <IncludeLibraryModules></IncludeLibraryModules>
+ <ComprImg>1</ComprImg>
+ </CommonProperty>
+ <FileArmAds>
+ <Cads>
+ <interw>2</interw>
+ <Optim>0</Optim>
+ <oTime>2</oTime>
+ <SplitLS>2</SplitLS>
+ <OneElfS>2</OneElfS>
+ <Strict>2</Strict>
+ <EnumInt>2</EnumInt>
+ <PlainCh>2</PlainCh>
+ <Ropi>2</Ropi>
+ <Rwpi>2</Rwpi>
+ <wLevel>0</wLevel>
+ <uThumb>2</uThumb>
+ <uSurpInc>2</uSurpInc>
+ <uC99>2</uC99>
+ <uGnu>2</uGnu>
+ <useXO>2</useXO>
+ <v6Lang>0</v6Lang>
+ <v6LangP>0</v6LangP>
+ <vShortEn>2</vShortEn>
+ <vShortWch>2</vShortWch>
+ <v6Lto>2</v6Lto>
+ <v6WtE>2</v6WtE>
+ <v6Rtti>2</v6Rtti>
+ <VariousControls>
+ <MiscControls></MiscControls>
+ <Define></Define>
+ <Undefine></Undefine>
+ <IncludePath></IncludePath>
+ </VariousControls>
+ </Cads>
+ </FileArmAds>
+ </FileOption>
+ </File>
+ <File>
+ <FileName>stm32h7xx_hal_crc_ex.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>../Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_crc_ex.c</FilePath>
+ <FileOption>
+ <CommonProperty>
+ <UseCPPCompiler>2</UseCPPCompiler>
+ <RVCTCodeConst>0</RVCTCodeConst>
+ <RVCTZI>0</RVCTZI>
+ <RVCTOtherData>0</RVCTOtherData>
+ <ModuleSelection>0</ModuleSelection>
+ <IncludeInBuild>1</IncludeInBuild>
+ <AlwaysBuild>2</AlwaysBuild>
+ <GenerateAssemblyFile>2</GenerateAssemblyFile>
+ <AssembleAssemblyFile>2</AssembleAssemblyFile>
+ <PublicsOnly>2</PublicsOnly>
+ <StopOnExitCode>11</StopOnExitCode>
+ <CustomArgument></CustomArgument>
+ <IncludeLibraryModules></IncludeLibraryModules>
+ <ComprImg>1</ComprImg>
+ </CommonProperty>
+ <FileArmAds>
+ <Cads>
+ <interw>2</interw>
+ <Optim>0</Optim>
+ <oTime>2</oTime>
+ <SplitLS>2</SplitLS>
+ <OneElfS>2</OneElfS>
+ <Strict>2</Strict>
+ <EnumInt>2</EnumInt>
+ <PlainCh>2</PlainCh>
+ <Ropi>2</Ropi>
+ <Rwpi>2</Rwpi>
+ <wLevel>0</wLevel>
+ <uThumb>2</uThumb>
+ <uSurpInc>2</uSurpInc>
+ <uC99>2</uC99>
+ <uGnu>2</uGnu>
+ <useXO>2</useXO>
+ <v6Lang>0</v6Lang>
+ <v6LangP>0</v6LangP>
+ <vShortEn>2</vShortEn>
+ <vShortWch>2</vShortWch>
+ <v6Lto>2</v6Lto>
+ <v6WtE>2</v6WtE>
+ <v6Rtti>2</v6Rtti>
+ <VariousControls>
+ <MiscControls></MiscControls>
+ <Define></Define>
+ <Undefine></Undefine>
+ <IncludePath></IncludePath>
+ </VariousControls>
+ </Cads>
+ </FileArmAds>
+ </FileOption>
+ </File>
+ <File>
<FileName>stm32h7xx_hal_rcc.c</FileName>
<FileType>1</FileType>
<FilePath>../Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_rcc.c</FilePath>
@@ -721,6 +893,97 @@
</Files>
</Group>
<Group>
+ <GroupName>Application/ALG</GroupName>
+ <Files>
+ <File>
+ <FileName>motion_control.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\FML\motion_control.c</FilePath>
+ </File>
+ <File>
+ <FileName>motion_path_data.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\FML\motion_path_data.c</FilePath>
+ </File>
+ <File>
+ <FileName>geo_utils.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\FML\geo_utils.c</FilePath>
+ </File>
+ <File>
+ <FileName>motion_control_task.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\APL\motion_control_task.c</FilePath>
+ </File>
+ <File>
+ <FileName>arm_math_compat.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\FML\arm_math_compat.c</FilePath>
+ <FileOption>
+ <CommonProperty>
+ <UseCPPCompiler>2</UseCPPCompiler>
+ <RVCTCodeConst>0</RVCTCodeConst>
+ <RVCTZI>0</RVCTZI>
+ <RVCTOtherData>0</RVCTOtherData>
+ <ModuleSelection>0</ModuleSelection>
+ <IncludeInBuild>0</IncludeInBuild>
+ <AlwaysBuild>2</AlwaysBuild>
+ <GenerateAssemblyFile>2</GenerateAssemblyFile>
+ <AssembleAssemblyFile>2</AssembleAssemblyFile>
+ <PublicsOnly>2</PublicsOnly>
+ <StopOnExitCode>11</StopOnExitCode>
+ <CustomArgument></CustomArgument>
+ <IncludeLibraryModules></IncludeLibraryModules>
+ <ComprImg>1</ComprImg>
+ </CommonProperty>
+ <FileArmAds>
+ <Cads>
+ <interw>2</interw>
+ <Optim>0</Optim>
+ <oTime>2</oTime>
+ <SplitLS>2</SplitLS>
+ <OneElfS>2</OneElfS>
+ <Strict>2</Strict>
+ <EnumInt>2</EnumInt>
+ <PlainCh>2</PlainCh>
+ <Ropi>2</Ropi>
+ <Rwpi>2</Rwpi>
+ <wLevel>0</wLevel>
+ <uThumb>2</uThumb>
+ <uSurpInc>2</uSurpInc>
+ <uC99>2</uC99>
+ <uGnu>2</uGnu>
+ <useXO>2</useXO>
+ <v6Lang>0</v6Lang>
+ <v6LangP>0</v6LangP>
+ <vShortEn>2</vShortEn>
+ <vShortWch>2</vShortWch>
+ <v6Lto>2</v6Lto>
+ <v6WtE>2</v6WtE>
+ <v6Rtti>2</v6Rtti>
+ <VariousControls>
+ <MiscControls></MiscControls>
+ <Define></Define>
+ <Undefine></Undefine>
+ <IncludePath></IncludePath>
+ </VariousControls>
+ </Cads>
+ </FileArmAds>
+ </FileOption>
+ </File>
+ <File>
+ <FileName>motion_calibration_task.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\APL\motion_calibration_task.c</FilePath>
+ </File>
+ <File>
+ <FileName>aes.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\FML\aes.c</FilePath>
+ </File>
+ </Files>
+ </Group>
+ <Group>
<GroupName>::CMSIS</GroupName>
</Group>
</Groups>
@@ -730,8 +993,14 @@
<RTE>
<apis/>
<components>
- <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
- <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+ <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.5.0" condition="ARMv6_7_8-M Device">
+ <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.8.0"/>
+ <targetInfos>
+ <targetInfo name="STM32H743"/>
+ </targetInfos>
+ </component>
+ <component Cclass="CMSIS" Cgroup="DSP" Cvariant="Source" Cvendor="ARM" Cversion="1.16.2" condition="CMSISCORE">
+ <package license="LICENSE" name="CMSIS-DSP" schemaVersion="1.7.27" url="https://www.keil.com/pack/" vendor="ARM" version="1.16.2"/>
<targetInfos>
<targetInfo name="STM32H743"/>
</targetInfos>
--
Gitblit v1.10.0