From 8aa49449ae60d1232c9d029e5b8b0ada2ae6346c Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期三, 22 三月 2023 16:45:54 +0800
Subject: [PATCH] 增加防撞标签逻辑

---
 MDK-ARM/L051.uvprojx |   57 +++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/MDK-ARM/L051.uvprojx b/MDK-ARM/L051.uvprojx
index 858fd3e..d6acd28 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.0.0</PackID>
+          <PackID>Keil.STM32L0xx_DFP.2.1.0</PackID>
           <PackURL>http://www.keil.com/pack/</PackURL>
           <Cpu>IRAM(0x20000000-0x20001FFF) IROM(0x8000000-0x800FFFF)  CLOCK(8000000) CPUTYPE("Cortex-M0+")</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
@@ -132,9 +132,9 @@
             <UseTargetDll>1</UseTargetDll>
             <UseExternalTool>0</UseExternalTool>
             <RunIndependent>0</RunIndependent>
-            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <UpdateFlashBeforeDebugging>0</UpdateFlashBeforeDebugging>
             <Capability>1</Capability>
-            <DriverSelection>4103</DriverSelection>
+            <DriverSelection>4101</DriverSelection>
           </Flash1>
           <bUseTDR>1</bUseTDR>
           <Flash2>STLink\ST-LINKIII-KEIL_SWO.dll</Flash2>
@@ -275,7 +275,7 @@
               <OCR_RVCT4>
                 <Type>1</Type>
                 <StartAddress>0x8005000</StartAddress>
-                <Size>0x10000</Size>
+                <Size>0xb000</Size>
               </OCR_RVCT4>
               <OCR_RVCT5>
                 <Type>1</Type>
@@ -312,7 +312,7 @@
           </ArmAdsMisc>
           <Cads>
             <interw>1</interw>
-            <Optim>1</Optim>
+            <Optim>4</Optim>
             <oTime>0</oTime>
             <SplitLS>0</SplitLS>
             <OneElfS>1</OneElfS>
@@ -338,7 +338,7 @@
               <MiscControls></MiscControls>
               <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>
@@ -397,6 +397,21 @@
               <FileType>1</FileType>
               <FilePath>..\Drivers\ExternlDrivers\lis3dh_driver.c</FilePath>
             </File>
+            <File>
+              <FileName>dps310.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\Src\ExternalDevices\dps310.c</FilePath>
+            </File>
+            <File>
+              <FileName>dps368_test.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\Src\ExternalDevices\dps368_test.c</FilePath>
+            </File>
+            <File>
+              <FileName>dw_driver.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\Src\decadriver\dw_driver.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -416,16 +431,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 +479,21 @@
               <FileName>serial_at_cmd_app.c</FileName>
               <FileType>1</FileType>
               <FilePath>..\Src\application\serial_at_cmd_app.c</FilePath>
+            </File>
+            <File>
+              <FileName>AutoSlot.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\Src\application\AutoSlot.c</FilePath>
+            </File>
+            <File>
+              <FileName>CRC.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\Src\application\CRC.c</FilePath>
+            </File>
+            <File>
+              <FileName>dw_ancapp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\Src\application\dw_ancapp.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -576,6 +596,11 @@
               <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_lptim.c</FileName>
               <FileType>1</FileType>
               <FilePath>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_lptim.c</FilePath>

--
Gitblit v1.9.3