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 | 84 +++++++++++++++++++++++++++++++++++++----
1 files changed, 75 insertions(+), 9 deletions(-)
diff --git a/MDK-ARM/L051.uvprojx b/MDK-ARM/L051.uvprojx
index 568af1a..dbbe5a7 100644
--- a/MDK-ARM/L051.uvprojx
+++ b/MDK-ARM/L051.uvprojx
@@ -16,7 +16,7 @@
<TargetCommonOption>
<Device>STM32L051C8Tx</Device>
<Vendor>STMicroelectronics</Vendor>
- <PackID>Keil.STM32L0xx_DFP.2.1.0</PackID>
+ <PackID>Keil.STM32L0xx_DFP.2.2.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IRAM(0x20000000,0x00002000) IROM(0x08000000,0x00010000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
@@ -110,11 +110,11 @@
</CommonProperty>
<DllOption>
<SimDllName>SARMCM3.DLL</SimDllName>
- <SimDllArguments> -REMAP-MPU </SimDllArguments>
+ <SimDllArguments>-REMAP</SimDllArguments>
<SimDlgDll>DARMCM1.DLL</SimDlgDll>
<SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
<TargetDllName>SARMCM3.DLL</TargetDllName>
- <TargetDllArguments>-MPU </TargetDllArguments>
+ <TargetDllArguments> </TargetDllArguments>
<TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
<TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
</DllOption>
@@ -132,13 +132,13 @@
<UseTargetDll>1</UseTargetDll>
<UseExternalTool>0</UseExternalTool>
<RunIndependent>0</RunIndependent>
- <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+ <UpdateFlashBeforeDebugging>0</UpdateFlashBeforeDebugging>
<Capability>1</Capability>
- <DriverSelection>4103</DriverSelection>
+ <DriverSelection>4096</DriverSelection>
</Flash1>
<bUseTDR>1</bUseTDR>
<Flash2>BIN\UL2CM3.DLL</Flash2>
- <Flash3></Flash3>
+ <Flash3>"" ()</Flash3>
<Flash4></Flash4>
<pFcarmOut></pFcarmOut>
<pFcarmGrp></pFcarmGrp>
@@ -275,7 +275,7 @@
</OCR_RVCT3>
<OCR_RVCT4>
<Type>1</Type>
- <StartAddress>0x8000000</StartAddress>
+ <StartAddress>0x8005000</StartAddress>
<Size>0x10000</Size>
</OCR_RVCT4>
<OCR_RVCT5>
@@ -337,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>
@@ -481,6 +481,16 @@
<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>
<Group>
@@ -587,6 +597,62 @@
<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>
--
Gitblit v1.9.3