From 1a6a4e043a5e0446bd5bbd79268dc8f362153c61 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期三, 05 七月 2023 13:27:12 +0800
Subject: [PATCH] 修改临近切换逻辑
---
Src/application/dw_app.c | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/Src/application/dw_app.c b/Src/application/dw_app.c
index c8aceda..7f10309 100644
--- a/Src/application/dw_app.c
+++ b/Src/application/dw_app.c
@@ -1054,18 +1054,18 @@
}
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&&nearbase_switchdistlist[rec_nearbasepos]==1)
+ if(temp_dist<salvebase_mindist&&nearbase_switchdistlist[rec_nearbasepos]!=0&&(nearbase_switchdistlist[rec_nearbasepos]==1||temp_dist<nearbase_switchdistlist[rec_nearbasepos]))
{
salvebase_mindist = temp_dist;
mindist_slavebaseid = rec_nearbaseid;
}
#ifdef SWITCHBASE_ZHUANDIAN
- if(temp_dist<nearbase_switchdistlist[rec_nearbasepos]&&nearbase_switchdistlist[rec_nearbasepos]>1&&temp_dist>0)
- {
- mainbase_id = rec_nearbaseid;
- tag_state = GETNEARMSG;
- trygetnearmsg_times = 0;
- }
+// if(temp_dist<nearbase_switchdistlist[rec_nearbasepos]&&nearbase_switchdistlist[rec_nearbasepos]>1&&temp_dist>0)
+// {
+// mainbase_id = rec_nearbaseid;
+// tag_state = GETNEARMSG;
+// trygetnearmsg_times = 0;
+// }
#endif
}
@@ -1093,8 +1093,9 @@
if(salvebase_mindist<mainbase_dist- THRESHOLD_CHANGE_MAINBASE_DIST )
{
changemainbase_count++;
- if(changemainbase_count>tag_frequency*2)
+ if(changemainbase_count>2)
{
+ changemainbase_count = 0;
mainbase_id = mindist_slavebaseid;
tag_state = GETNEARMSG;
trygetnearmsg_times = 0;
@@ -1103,13 +1104,14 @@
changemainbase_count = 0;
}
#endif
- }else if(mainbase_lost_count>5*tag_frequency)
+ }else if(mainbase_lost_count>10)
{
+ mainbase_lost_count = 0;
tag_state = DISCPOLL;
}
if(mainbase_lost_count!=0)
{
- if(mainbase_lost_count<=tag_frequency*1)
+ if(mainbase_lost_count<=5)
{NextSlotDelayMs(0);
}else{
NextSlotDelayMs(0);
--
Gitblit v1.9.3