From 5739481744a7d26671190f6f327726e23843dd6d Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 02 十一月 2020 15:34:13 +0800
Subject: [PATCH] Merge branch '定位-临近' into 定位临近_工卡

---
 MDK-ARM/L051.uvprojx |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/MDK-ARM/L051.uvprojx b/MDK-ARM/L051.uvprojx
index 78b330a..8f407cf 100644
--- a/MDK-ARM/L051.uvprojx
+++ b/MDK-ARM/L051.uvprojx
@@ -390,16 +390,6 @@
           </Files>
         </Group>
         <Group>
-          <GroupName>ExternlDrivers</GroupName>
-          <Files>
-            <File>
-              <FileName>lis3dh_driver.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\Drivers\ExternlDrivers\lis3dh_driver.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
           <GroupName>deacadriver</GroupName>
           <Files>
             <File>
@@ -417,15 +407,30 @@
               <FileType>1</FileType>
               <FilePath>..\Src\decadriver\deca_range_tables.c</FilePath>
             </File>
+            <File>
+              <FileName>dw_driver.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\Src\decadriver\dw_driver.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
           <GroupName>ExternalDevices</GroupName>
           <Files>
             <File>
-              <FileName>dw_driver.c</FileName>
+              <FileName>lis3dh_driver.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\Src\ExternalDevices\dw_driver.c</FilePath>
+              <FilePath>..\Src\ExternalDevices\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>
           </Files>
         </Group>

--
Gitblit v1.9.3