From 1ebb084c4d5216f4e5e3e61a63c88f568caf779e Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 28 九月 2018 11:27:10 +0800
Subject: [PATCH] 增加多标签测距功能,标签有bug,长时间会死机

---
 源码/核心板/Src/application/dw_app.c |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
index bdd2e5a..731f7e8 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
@@ -138,6 +138,8 @@
 float dis_after_filter;				//当前距离值
 LPFilter_Frac* p_Dis_Filter;		//测距用的低通滤波器
 
+uint16_t g_Tagdist[256];
+uint8_t g_flag_Taggetdist[256];
 /*------------------------------------ Functions ------------------------------------------*/
 
 
@@ -219,7 +221,23 @@
         *ts += ts_field[i] << (i * 8);
     }
 }
-
+void TagDistClear(void)
+{
+	static uint16_t clear_judge_cnt;
+	uint16_t i;
+	if(clear_judge_cnt++>1000)  //设定1S分频,每秒进一次。判断标志位大于等于2,2s没收到数据就把数据变成0xffff,不触发警报。
+	{
+		clear_judge_cnt=0;
+		for(i=0;i<255;i++)
+		{
+			g_flag_Taggetdist[i]++;
+			if(g_flag_Taggetdist[i]>=2)
+			{
+				g_Tagdist[i]=0xffff;
+			}
+		}
+	}
+}
 void Dw1000_Init(void)
 {
 	/* Reset and initialise DW1000.
@@ -245,6 +263,7 @@
 }
 void Dw1000_App_Init(void)
 {
+	g_com_map[DEV_ID]=0x03;
 	tx_poll_msg[MESSAGE_TYPE_IDX]=POLL;
 	tx_resp_msg[MESSAGE_TYPE_IDX]=RESPONSE;
 	tx_final_msg[MESSAGE_TYPE_IDX]=FINAL;
@@ -469,6 +488,8 @@
 					LED0_BLINK; //每成功一次通讯则闪烁一次
 					g_UWB_com_interval = 0;
 					dis_after_filter=dist_cm;
+					g_Tagdist[tag_id_recv]=dist_cm;
+					g_flag_Taggetdist[tag_id_recv]=0;
 					//dis_after_filter = LP_Frac_Update(p_Dis_Filter, dist_cm);
 
 				}

--
Gitblit v1.9.3