From 0942f592f3c033983c4ccaba6d632bbf80611abb Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期三, 21 五月 2025 14:29:55 +0800
Subject: [PATCH] 上传格式正确，但电量未采集版本，未加入蓝牙与mk和mk和lora和网关同步修改配置逻辑，测距稳定能用基础版本
---
keil/include/src/Radio/lora_1268.c | 2 +-
keil/include/drivers/dw_tag.h | 2 ++
keil/include/drivers/dw_app_anchor.h | 3 ++-
keil/include/drivers/uwb_app.c | 10 +++++++++-
4 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/keil/include/drivers/dw_app_anchor.h b/keil/include/drivers/dw_app_anchor.h
index 212c3d5..63d9d16 100644
--- a/keil/include/drivers/dw_app_anchor.h
+++ b/keil/include/drivers/dw_app_anchor.h
@@ -33,7 +33,8 @@
#define RESP_MSG_RESP_TX_TS_IDX 30
#define RESP_MSG_ANC_DISTOFFSET 34
-#define TAG_KEEPTIMES 20 //标签存活时间
+#define TAG_KEEPTIMES 30 //标签存活时间
+#define REPORT_TAG_KEEPTIMES 30 //上报存活时间
#define MAX_TAG_LIST_NUM 200 //同时通讯标签最大数量
#define FREQ_OFFSET_MULTIPLIER (998.4e6/2.0/1024.0/131072.0)
diff --git a/keil/include/drivers/dw_tag.h b/keil/include/drivers/dw_tag.h
index 44710cb..298679c 100644
--- a/keil/include/drivers/dw_tag.h
+++ b/keil/include/drivers/dw_tag.h
@@ -23,6 +23,7 @@
#define ANCHOR_ID_IDX 1
#define MAX_NEARBASE_NUM 25
#define TAG_KEEPTIMES 30 //标签存活时间
+
#define KEEP_TIMES 5
#define TAG_NUM_IN_SYS 25
@@ -38,6 +39,7 @@
#define NEARBASEID_INDEX 11
#define TAG_KEEPTIMES 30 //标签存活时间
+
#define MAX_TAG_LIST_NUM 200 //同时通讯标签最大数量
#define FREQ_OFFSET_MULTIPLIER (998.4e6/2.0/1024.0/131072.0)
diff --git a/keil/include/drivers/uwb_app.c b/keil/include/drivers/uwb_app.c
index 0ee9813..88ce2e0 100644
--- a/keil/include/drivers/uwb_app.c
+++ b/keil/include/drivers/uwb_app.c
@@ -461,11 +461,18 @@
// }
// anchordata_num=j;
//}
+uint16_t report_ancdist[ANC_MAX_NUM],report_ancid[ANC_MAX_NUM];
void TagListUpdate(void)
{
uint16_t i,j=0,k=0;
for(i=0; i<taglist_num; i++)
- {
+ {
+
+ if(tagofflinetime[i]++<REPORT_TAG_KEEPTIMES)
+ {
+ report_ancid[k]=tagid_list[i];
+ report_ancdist[k++]=(uint16_t)tagdist_list[i];
+ }
if(tagofflinetime[i]++<TAG_KEEPTIMES)
{
tagid_list[j]=tagid_list[i];
@@ -474,6 +481,7 @@
tagofflinetime[j++]=tagofflinetime[i];
}
}
+ report_ancnum = k;
taglist_num=j;
}
diff --git a/keil/include/src/Radio/lora_1268.c b/keil/include/src/Radio/lora_1268.c
index 4f1ec2f..cf1a5e8 100644
--- a/keil/include/src/Radio/lora_1268.c
+++ b/keil/include/src/Radio/lora_1268.c
@@ -306,7 +306,7 @@
printf("气压值：%d",intheight);
#endif
- TagListUpdate();
+// TagListUpdate();
LoraReportFreqPoll();
flag_getwgresp = 0;
--
Gitblit v1.9.3