From 5dfb6c255ed939aebe5d5a9aa9d5a8343c1a3a44 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 25 八月 2021 18:26:02 +0800
Subject: [PATCH] V1.33 上海测试完成
---
Src/application/dw_app.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Src/application/dw_app.c b/Src/application/dw_app.c
index e38a85a..9e42f29 100644
--- a/Src/application/dw_app.c
+++ b/Src/application/dw_app.c
@@ -628,12 +628,17 @@
void GetNearMsg(void)
{
u32 start_poll,frame_len;
-
+ u8 nearmsg_i=0;
+ for(nearmsg_i=0;nearmsg_i<20;nearmsg_i++)
+ {
+ nearbase_distlist[nearmsg_i] = 0x1ffff;
+ }
//mainbase_id = 0x9724;
memcpy(&tx_near_msg[ANCHOR_ID_IDX],&mainbase_id,2);
memcpy(&tx_near_msg[TAG_ID_IDX],&dev_id,2);
tx_near_msg[MESSAGE_TYPE_IDX] = NEAR_MSG;
+
dwt_setrxaftertxdelay(POLL_TX_TO_RESP_RX_DLY_UUS); //设置发送后开启接收，并设定延迟时间
dwt_setrxtimeout(RESP_RX_TIMEOUT_UUS);
dwt_writetxdata(12, tx_near_msg, 0);//将Poll包数据传给DW1000，将在开启发送时传出去
@@ -831,14 +836,14 @@
memcpy(&nearbase_switchdistlist[rec_nearbasepos],&rx_buffer[NR_NEARSWITCH_DISTANCE],2);
nearbase_distlist[rec_nearbasepos+1]=temp_dist; // nearbase_distlist[1]对应 rec_nearbaseid[0]的距离
final_msg_set_ts(&tx_near_msg[FINAL_MSG_RESP_RX_NEARBASE_IDX+(rec_nearbasepos)*4], resp_rx_ts);
- if(temp_dist<salvebase_mindist)
+ if(temp_dist<salvebase_mindist&&nearbase_switchdistlist[rec_nearbasepos]==1)
{
salvebase_mindist = temp_dist;
mindist_slavebaseid = rec_nearbaseid;
}
#ifdef SWITCHBASE_ZHUANDIAN
- if(temp_dist<nearbase_switchdistlist[rec_nearbasepos]&&nearbase_switchdistlist[rec_nearbasepos]!=0&&temp_dist>0)
- {
+ if(temp_dist<nearbase_switchdistlist[rec_nearbasepos]&&nearbase_switchdistlist[rec_nearbasepos]>1&&temp_dist>0)
+ {
mainbase_id = rec_nearbaseid;
tag_state = GETNEARMSG;
}
@@ -877,7 +882,7 @@
changemainbase_count = 0;
}
#endif
- }else if(mainbase_lost_count>10*tag_frequency)
+ }else if(mainbase_lost_count>5*tag_frequency)
{
tag_state = STARTPOLL;
}
--
Gitblit v1.9.3