From fad1b368e3d987d753d3424c0144f574c6e44d2c Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期四, 11 四月 2024 11:14:06 +0800
Subject: [PATCH] Merge branch '免布线URT-LORA-L071' of http://47.108.70.204:60062/r/XRange_Tag into 免布线URT-LORA-L071
---
MDK-ARM/L051.uvprojx | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/MDK-ARM/L051.uvprojx b/MDK-ARM/L051.uvprojx
index d9d037d..82b62eb 100644
--- a/MDK-ARM/L051.uvprojx
+++ b/MDK-ARM/L051.uvprojx
@@ -132,9 +132,9 @@
<UseTargetDll>1</UseTargetDll>
<UseExternalTool>0</UseExternalTool>
<RunIndependent>0</RunIndependent>
- <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+ <UpdateFlashBeforeDebugging>0</UpdateFlashBeforeDebugging>
<Capability>1</Capability>
- <DriverSelection>4101</DriverSelection>
+ <DriverSelection>4103</DriverSelection>
</Flash1>
<bUseTDR>1</bUseTDR>
<Flash2>STLink\ST-LINKIII-KEIL_SWO.dll</Flash2>
@@ -275,7 +275,7 @@
</OCR_RVCT3>
<OCR_RVCT4>
<Type>1</Type>
- <StartAddress>0x8005000</StartAddress>
+ <StartAddress>0x8007800</StartAddress>
<Size>0x10000</Size>
</OCR_RVCT4>
<OCR_RVCT5>
@@ -337,9 +337,9 @@
<v6Rtti>0</v6Rtti>
<VariousControls>
<MiscControls></MiscControls>
- <Define>USE_HAL_DRIVER,STM32L071xx</Define>
+ <Define>USE_HAL_DRIVER,STM32L071xx,USE_GPS,_USE_BAR</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;../Middlewares/HIDOLibrary/Include</IncludePath>
</VariousControls>
</Cads>
<Aads>
@@ -397,6 +397,16 @@
<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>..\Drivers\ExternlDrivers\dps310.c</FilePath>
+ </File>
+ <File>
+ <FileName>dps368_test.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Drivers\ExternlDrivers\dps368_test.c</FilePath>
</File>
</Files>
</Group>
@@ -495,6 +505,11 @@
<FileName>dw_mbx_tag.c</FileName>
<FileType>1</FileType>
<FilePath>..\Src\application\dw_mbx_tag.c</FilePath>
+ </File>
+ <File>
+ <FileName>GPS.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\application\GPS.c</FilePath>
</File>
</Files>
</Group>
@@ -1926,6 +1941,16 @@
</Files>
</Group>
<Group>
+ <GroupName>Middlewares/HIDOLibrary</GroupName>
+ <Files>
+ <File>
+ <FileName>HIDOLibrary.lib</FileName>
+ <FileType>4</FileType>
+ <FilePath>..\Middlewares\HIDOLibrary\HIDOLibrary.lib</FilePath>
+ </File>
+ </Files>
+ </Group>
+ <Group>
<GroupName>::CMSIS</GroupName>
</Group>
</Groups>
--
Gitblit v1.9.3