From a6ddff5c49ef22b708bd739c83648af738b8f598 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 15 十月 2024 14:47:00 +0800
Subject: [PATCH] 2.13，修复跟主基站测距131071，修复切换主机占测距跟id不匹配的bug
---
MDK-ARM/L051.uvprojx | 146 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 119 insertions(+), 27 deletions(-)
diff --git a/MDK-ARM/L051.uvprojx b/MDK-ARM/L051.uvprojx
index 4e5b436..dbbe5a7 100644
--- a/MDK-ARM/L051.uvprojx
+++ b/MDK-ARM/L051.uvprojx
@@ -10,20 +10,20 @@
<TargetName>L051</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
- <pCCUsed>5060750::V5.06 update 6 (build 750)::ARMCC</pCCUsed>
+ <pCCUsed>5060750::V5.06 update 6 (build 750)::.\ARMCC</pCCUsed>
<uAC6>0</uAC6>
<TargetOption>
<TargetCommonOption>
<Device>STM32L051C8Tx</Device>
<Vendor>STMicroelectronics</Vendor>
- <PackID>Keil.STM32L0xx_DFP.2.0.0</PackID>
+ <PackID>Keil.STM32L0xx_DFP.2.2.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
- <Cpu>IRAM(0x20000000-0x20001FFF) IROM(0x8000000-0x800FFFF) CLOCK(8000000) CPUTYPE("Cortex-M0+")</Cpu>
+ <Cpu>IRAM(0x20000000,0x00002000) IROM(0x08000000,0x00010000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
<StartupFile></StartupFile>
- <FlashDriverDll></FlashDriverDll>
- <DeviceId></DeviceId>
- <RegisterFile></RegisterFile>
+ <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32L0xx_64 -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM))</FlashDriverDll>
+ <DeviceId>0</DeviceId>
+ <RegisterFile>$$Device:STM32L051C8Tx$Drivers\CMSIS\Device\ST\STM32L0xx\Include\stm32l0xx.h</RegisterFile>
<MemoryEnv></MemoryEnv>
<Cmp></Cmp>
<Asm></Asm>
@@ -33,7 +33,7 @@
<SLE66CMisc></SLE66CMisc>
<SLE66AMisc></SLE66AMisc>
<SLE66LinkerMisc></SLE66LinkerMisc>
- <SFDFile>$$Device:STM32L051C8Tx$CMSIS/SVD/STM32L051x.svd</SFDFile>
+ <SFDFile>$$Device:STM32L051C8Tx$CMSIS\SVD\STM32L051x.svd</SFDFile>
<bCustSvd>0</bCustSvd>
<UseEnv>0</UseEnv>
<BinPath></BinPath>
@@ -132,13 +132,13 @@
<UseTargetDll>1</UseTargetDll>
<UseExternalTool>0</UseExternalTool>
<RunIndependent>0</RunIndependent>
- <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+ <UpdateFlashBeforeDebugging>0</UpdateFlashBeforeDebugging>
<Capability>1</Capability>
- <DriverSelection>4107</DriverSelection>
+ <DriverSelection>4096</DriverSelection>
</Flash1>
<bUseTDR>1</bUseTDR>
- <Flash2>STLink\ST-LINKIII-KEIL_SWO.dll</Flash2>
- <Flash3></Flash3>
+ <Flash2>BIN\UL2CM3.DLL</Flash2>
+ <Flash3>"" ()</Flash3>
<Flash4></Flash4>
<pFcarmOut></pFcarmOut>
<pFcarmGrp></pFcarmGrp>
@@ -185,6 +185,7 @@
<uocXRam>0</uocXRam>
<RvdsVP>0</RvdsVP>
<RvdsMve>0</RvdsMve>
+ <RvdsCdeCp>0</RvdsCdeCp>
<hadIRAM2>0</hadIRAM2>
<hadIROM2>0</hadIROM2>
<StupSel>8</StupSel>
@@ -312,7 +313,7 @@
</ArmAdsMisc>
<Cads>
<interw>1</interw>
- <Optim>1</Optim>
+ <Optim>4</Optim>
<oTime>0</oTime>
<SplitLS>0</SplitLS>
<OneElfS>1</OneElfS>
@@ -336,9 +337,9 @@
<v6Rtti>0</v6Rtti>
<VariousControls>
<MiscControls></MiscControls>
- <Define>USE_HAL_DRIVER,STM32L051xx</Define>
+ <Define>USE_HAL_DRIVER,STM32L051xx,</Define>
<Undefine></Undefine>
- <IncludePath>../Inc; ../Drivers/STM32L0xx_HAL_Driver/Inc; ../Drivers/STM32L0xx_HAL_Driver/Inc/Legacy; ../Drivers/CMSIS/Device/ST/STM32L0xx/Include; ../Drivers/CMSIS/Include; ..\Drivers\ExternlDrivers; ..\Src\decadriver; ..\Src\ExternalDevices; ..\Src\OnChipDevices; ..\Src\algorithm; ..\Src\application</IncludePath>
+ <IncludePath>../Inc; ../Drivers/STM32L0xx_HAL_Driver/Inc; ../Drivers/STM32L0xx_HAL_Driver/Inc/Legacy; ../Drivers/CMSIS/Device/ST/STM32L0xx/Include; ../Drivers/CMSIS/Include; ..\Drivers\ExternlDrivers; ..\Src\decadriver; ..\Src\ExternalDevices; ..\Src\OnChipDevices; ..\Src\algorithm; ..\Src\application</IncludePath>
</VariousControls>
</Cads>
<Aads>
@@ -351,7 +352,7 @@
<NoWarn>0</NoWarn>
<uSurpInc>0</uSurpInc>
<useXO>0</useXO>
- <uClangAs>0</uClangAs>
+ <ClangAsOpt>4</ClangAsOpt>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@@ -397,6 +398,16 @@
<FileType>1</FileType>
<FilePath>..\Drivers\ExternlDrivers\lis3dh_driver.c</FilePath>
</File>
+ <File>
+ <FileName>dw_driver.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\decadriver\dw_driver.c</FilePath>
+ </File>
+ <File>
+ <FileName>BMP390.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\ExternalDevices\BMP390.c</FilePath>
+ </File>
</Files>
</Group>
<Group>
@@ -416,16 +427,6 @@
<FileName>deca_range_tables.c</FileName>
<FileType>1</FileType>
<FilePath>..\Src\decadriver\deca_range_tables.c</FilePath>
- </File>
- </Files>
- </Group>
- <Group>
- <GroupName>ExternalDevices</GroupName>
- <Files>
- <File>
- <FileName>dw_driver.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\ExternalDevices\dw_driver.c</FilePath>
</File>
</Files>
</Group>
@@ -474,6 +475,21 @@
<FileName>serial_at_cmd_app.c</FileName>
<FileType>1</FileType>
<FilePath>..\Src\application\serial_at_cmd_app.c</FilePath>
+ </File>
+ <File>
+ <FileName>dw_ds_anc.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\application\dw_ds_anc.c</FilePath>
+ </File>
+ <File>
+ <FileName>ss_dw_tag_core.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\application\ss_dw_tag_core.c</FilePath>
+ </File>
+ <File>
+ <FileName>dw_sync.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\application\dw_sync.c</FilePath>
</File>
</Files>
</Group>
@@ -576,6 +592,67 @@
<FilePath>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_cortex.c</FilePath>
</File>
<File>
+ <FileName>stm32l0xx_hal_exti.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_exti.c</FilePath>
+ </File>
+ <File>
+ <FileName>stm32l0xx_hal_iwdg.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_iwdg.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>stm32l0xx_hal_lptim.c</FileName>
<FileType>1</FileType>
<FilePath>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_lptim.c</FilePath>
@@ -627,8 +704,8 @@
<RTE>
<apis/>
<components>
- <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
- <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
+ <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="L051"/>
</targetInfos>
@@ -637,4 +714,19 @@
<files/>
</RTE>
+ <LayerInfo>
+ <Layers>
+ <Layer>
+ <LayName><Project Info></LayName>
+ <LayDesc></LayDesc>
+ <LayUrl></LayUrl>
+ <LayKeys></LayKeys>
+ <LayCat></LayCat>
+ <LayLic></LayLic>
+ <LayTarg>0</LayTarg>
+ <LayPrjMark>1</LayPrjMark>
+ </Layer>
+ </Layers>
+ </LayerInfo>
+
</Project>
--
Gitblit v1.9.3