From 810560554f3be7c23dabd7d484ef2b2822c2ae46 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 15 十二月 2020 10:43:57 +0800
Subject: [PATCH] 同步稳定性
---
Src/application/dw_app.c | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/Src/application/dw_app.c b/Src/application/dw_app.c
index 459877e..c2c2c43 100644
--- a/Src/application/dw_app.c
+++ b/Src/application/dw_app.c
@@ -69,7 +69,7 @@
#define FINAL_MSG_FINAL_TX_TS_IDX 18
#define FINAL_MSG_TS_LEN 4
-#define STARTPOLL DISCPOLL
+#define STARTPOLL REGPOLL
enum enumtagstate
{
REGPOLL,
@@ -552,7 +552,7 @@
{
memcpy(&minid, &rx_buffer[ANCHOR_ID_IDX], 4);
tag_state=GETNEARMSG;
- trygetnearmsg_times=5;
+ trygetnearmsg_times=10*tag_frequency;
mindist=temp_dist;
}
if(result==0)
@@ -777,7 +777,7 @@
memcpy(&nearbase_switchdistlist[rec_nearbasepos],&rx_buffer[NR_NEARSWITCH_DISTANCE],2);
nearbase_distlist[rec_nearbasepos]=temp_dist;
final_msg_set_ts(&tx_near_msg[FINAL_MSG_RESP_RX_NEARBASE_IDX+(rec_nearbasepos)*4], resp_rx_ts);
- 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]!=0&&temp_dist>0)
{
mainbase_id = rec_nearbaseid;
tag_state = GETNEARMSG;
@@ -852,9 +852,9 @@
// mainbase_id = true_nearbase_idlist[0];
// tag_state = GETNEARMSG;
// }
- if(mainbase_lost_count>10)
+ if(mainbase_lost_count>10*tag_frequency)
{
- tag_state = DISCPOLL;
+ tag_state = STARTPOLL;
}
// for (i=0;i<nearbase_num;i++)
// {
@@ -976,6 +976,7 @@
mainbase_id=rec_nearbaseid;
nearbase_num=rx_buffer[NEARBASENUM_INDEX];
memcpy(nearbaseid_list,&rx_buffer[NEARBASEID_INDEX],nearbase_num*2);
+ if(tagslotpos!=255)
tag_state = NEARPOLL;
}
}
@@ -988,7 +989,7 @@
id = dwt_readdevid() ;
while (DWT_DEVICE_ID != id)
{
- Dw1000_Init();
+ // Dw1000_Init();
id = dwt_readdevid() ;
}
switch(tag_state)
@@ -1010,13 +1011,11 @@
LED_LG_OFF;
if(trygetnearmsg_times==0)
{
- tag_state = DISCPOLL;
+ tag_state = STARTPOLL;
}
break;
- case NEARPOLL:
- //GPIO_WriteBit(EU_TX_GPIO, EU_RX_PIN, Bit_SET);
+ case NEARPOLL:
NearPoll();
- //GPIO_WriteBit(EU_TX_GPIO, EU_RX_PIN, Bit_RESET);
break;
}
dwt_entersleep();
--
Gitblit v1.9.3