From fc78430a35be252a1cd5a29b5b66290a68cd9ca3 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 27 八月 2024 17:21:18 +0800
Subject: [PATCH] Merge branch '安邦测距手环' of http://47.108.70.204:60062/r/ChinaUWBProject into 安邦测距手环
---
keil/uwb_simple_example.uvprojx | 49 +++++++++++--------------------------------------
1 files changed, 11 insertions(+), 38 deletions(-)
diff --git a/keil/uwb_simple_example.uvprojx b/keil/uwb_simple_example.uvprojx
index 7e88223..3595686 100644
--- a/keil/uwb_simple_example.uvprojx
+++ b/keil/uwb_simple_example.uvprojx
@@ -313,7 +313,7 @@
</ArmAdsMisc>
<Cads>
<interw>1</interw>
- <Optim>1</Optim>
+ <Optim>4</Optim>
<oTime>0</oTime>
<SplitLS>0</SplitLS>
<OneElfS>1</OneElfS>
@@ -971,6 +971,16 @@
<FileType>1</FileType>
<FilePath>.\include\src\TCPClient.c</FilePath>
</File>
+ <File>
+ <FileName>gps.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>.\include\src\gps.c</FilePath>
+ </File>
+ <File>
+ <FileName>uwb_app.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>.\uwb_app.c</FilePath>
+ </File>
</Files>
</Group>
<Group>
@@ -1152,43 +1162,6 @@
</Group>
<Group>
<GroupName>Simple</GroupName>
- <Files>
- <File>
- <FileName>simple_ss_twr_dw_resp.c</FileName>
- <FileType>1</FileType>
- <FilePath>.\simple_ss_twr_dw_resp.c</FilePath>
- </File>
- <File>
- <FileName>simple_ds_twr_init.c</FileName>
- <FileType>1</FileType>
- <FilePath>.\include\src\uwb_examples\uwb_simple_example\simple_ds_twr_init\simple_ds_twr_init.c</FilePath>
- </File>
- <File>
- <FileName>simple_ds_twr_init_sts.c</FileName>
- <FileType>1</FileType>
- <FilePath>.\include\src\uwb_examples\uwb_simple_example\simple_ds_twr_init_sts\simple_ds_twr_init_sts.c</FilePath>
- </File>
- <File>
- <FileName>simple_ds_twr_resp.c</FileName>
- <FileType>1</FileType>
- <FilePath>.\include\src\uwb_examples\uwb_simple_example\simple_ds_twr_resp\simple_ds_twr_resp.c</FilePath>
- </File>
- <File>
- <FileName>simple_ds_twr_resp_sts.c</FileName>
- <FileType>1</FileType>
- <FilePath>.\include\src\uwb_examples\uwb_simple_example\simple_ds_twr_resp_sts\simple_ds_twr_resp_sts.c</FilePath>
- </File>
- <File>
- <FileName>simple_rx.c</FileName>
- <FileType>1</FileType>
- <FilePath>.\include\src\uwb_examples\uwb_simple_example\simple_rx\simple_rx.c</FilePath>
- </File>
- <File>
- <FileName>simple_tx.c</FileName>
- <FileType>1</FileType>
- <FilePath>.\include\src\uwb_examples\uwb_simple_example\simple_tx\simple_tx.c</FilePath>
- </File>
- </Files>
</Group>
<Group>
<GroupName>Utility</GroupName>
--
Gitblit v1.9.3