From 587490c9e45f5b7eddc08fdd45bc4e1d338c7e7e Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 19 十一月 2024 11:20:09 +0800
Subject: [PATCH] Merge branch '免布线标签-lora-泰斗GPS' of http://47.108.70.204:60062/r/XRange_Tag into 免布线标签-lora-泰斗GPS
---
MDK-ARM/L051.uvprojx | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/MDK-ARM/L051.uvprojx b/MDK-ARM/L051.uvprojx
index 68005ce..cfc3749 100644
--- a/MDK-ARM/L051.uvprojx
+++ b/MDK-ARM/L051.uvprojx
@@ -10,7 +10,7 @@
<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>
@@ -339,7 +339,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;../Src/radio</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; ../Src/radio</IncludePath>
</VariousControls>
</Cads>
<Aads>
@@ -382,22 +382,30 @@
<Groups>
<Group>
<GroupName>Application/MDK-ARM</GroupName>
+ </Group>
+ <Group>
+ <GroupName>ExternlDrivers</GroupName>
<Files>
<File>
<FileName>startup_stm32l051xx.s</FileName>
<FileType>2</FileType>
<FilePath>startup_stm32l051xx.s</FilePath>
</File>
- </Files>
- </Group>
- <Group>
- <GroupName>ExternlDrivers</GroupName>
- <Files>
<File>
<FileName>lis3dh_driver.c</FileName>
<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>
</Files>
</Group>
<Group>
--
Gitblit v1.9.3