From 5cb269400905175cf618729ab44dfa4ccd3d0331 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期一, 21 七月 2025 17:51:51 +0800
Subject: [PATCH] 串口扫描功能调通，升级有问题
---
keil/uwb_app.c | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/keil/uwb_app.c b/keil/uwb_app.c
index 61c9ede..75e274b 100644
--- a/keil/uwb_app.c
+++ b/keil/uwb_app.c
@@ -37,7 +37,7 @@
extern uint8_t group_id;
static uint16_t anc_id_recv,tag_id_recv;
static int16_t rec_antdelay;
-extern uint32_t dev_id;
+extern uint16_t dev_id;
static uint16_t taglist_pos,tmp_time;
extern uint16_t tag_frequency;
extern uint16_t disoffset;
@@ -706,11 +706,13 @@
{
UWBIdleTask();
}
+uint16_t tempid_test;
+uint8_t ceju_count;
int Anchor_App(void)
{
uint8_t i;
uint16_t tempid;
- if(group_id==rx_buf[GROUP_ID_IDX]&&rx_buf[MESSAGE_TYPE_IDX] == MBX_POLL)//判断是否是和自己是同一组通讯的且为poll包
+ if(group_id==rx_buf[GROUP_ID_IDX]&&rx_buf[MESSAGE_TYPE_IDX] == MBX_POLL)//判断是否是和自己是同一组通讯的且为poll包
{ flag_recsuccess = 1;
wltag_state=RANGE;//成功后从search切换为range
memcpy(&g_com_receive_id,&rx_buf[TAG_ID_IDX],2);
@@ -753,6 +755,9 @@
for(i=0; i<rec_nearbase_num; i++)
{
memcpy(&tempid,&rx_buf[FZ_NEARBASEID_INDEX+i*2],2);
+ memcpy(&tempid_test,&rx_buf[FZ_NEARBASEID_INDEX+i*2],2);
+
+// if(memcmp(&tempid,&dev_id,2))
if(tempid==dev_id)
{
Anchor_RecNearPoll(i);
@@ -769,8 +774,9 @@
break;
}
}
- if((i==rec_nearbase_num&&taglist_pos==taglist_num)||(rec_nearbase_num==0&&!ExistInTagList(tag_id_recv)))//当基站不在标签列表中，标签也不在基站列表中时，随机找个时间片回复基站。
+ if((i==rec_nearbase_num&&taglist_pos==taglist_num)||(rec_nearbase_num==0&&!ExistInTagList(tag_id_recv)))//当基站不在标签列表中，标签也不在基站列表中时，随机找个时间片回复基站。
{
+// ceju_count++;
Anchor_RecNearPoll(rec_nearbase_num);
}
}
--
Gitblit v1.9.3