From c8a99f8293e1ae335501390de5bab05db487a0f9 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期四, 29 二月 2024 18:17:59 +0800
Subject: [PATCH] Merge branch '免布线基站-lora' of http://47.108.70.204:60062/r/XRange_Tag into 免布线基站-lora
---
MDK-ARM/L051.uvprojx | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/MDK-ARM/L051.uvprojx b/MDK-ARM/L051.uvprojx
index 042d21a..a2801b3 100644
--- a/MDK-ARM/L051.uvprojx
+++ b/MDK-ARM/L051.uvprojx
@@ -10,13 +10,13 @@
<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>STM32L071CBTx</Device>
<Vendor>STMicroelectronics</Vendor>
- <PackID>Keil.STM32L0xx_DFP.2.2.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>
@@ -114,7 +114,7 @@
<SimDlgDll>DARMCM1.DLL</SimDlgDll>
<SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
<TargetDllName>SARMCM3.DLL</TargetDllName>
- <TargetDllArguments></TargetDllArguments>
+ <TargetDllArguments> </TargetDllArguments>
<TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
<TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
</DllOption>
@@ -394,9 +394,19 @@
<GroupName>ExternlDrivers</GroupName>
<Files>
<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>lis3dh_driver.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Drivers\ExternlDrivers\lis3dh_driver.c</FilePath>
+ <FilePath>..\Src\ExternalDevices\lis3dh_driver.c</FilePath>
</File>
</Files>
</Group>
--
Gitblit v1.9.3