From 5e6d76b2478869fbc246f50846a8da8f1f455f45 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 11 十二月 2020 16:44:05 +0800
Subject: [PATCH] V2.14支持手动修改时间片 报警距离1

---
 Src/application/dw_app.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Src/application/dw_app.c b/Src/application/dw_app.c
index 0be97d4..bbab7db 100644
--- a/Src/application/dw_app.c
+++ b/Src/application/dw_app.c
@@ -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)
@@ -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,7 +1011,7 @@
 		LED_LG_OFF;
 		if(trygetnearmsg_times==0)
 		{
-			tag_state = DISCPOLL;
+			tag_state = STARTPOLL;
 		}
 			break;
 		case NEARPOLL:

--
Gitblit v1.9.3