From 0fab14bd3b70cdb16f134eaeeaac7d0947f2078f Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 25 十一月 2020 19:36:16 +0800
Subject: [PATCH] 增加速度滤波阈值
---
源码/核心板/Src/application/dw_app.c | 9 +++++----
1 files changed, 5 insertions(+), 4 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 49438ad..9a871d1 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"
@@ -448,7 +448,7 @@
{
g_Tagdist[anc_id_recv]= hex_dist2;
g_flag_Taggetdist[anc_id_recv]=0;
-
+// g_Resttimer=0;
if(!g_com_map[MODBUS_MODE])
{
hex_dist2 = hex_dist2;
@@ -470,7 +470,7 @@
/* Poll DW1000 until TX frame sent event set. See NOTE 8 below. */
if(result==0)
{
- g_Resttimer=0;
+
while (!(dwt_read32bitreg(SYS_STATUS_ID) & SYS_STATUS_TXFRS))//不断查询芯片状态直到发送完成
{ };
}
@@ -508,6 +508,7 @@
#define TDFILTER
//#define CHECK_UID
extern uint8_t UID_ERROR;
+extern u16 dist_threshold;
u8 misdist_num[TAG_NUM_IN_SYS];
void Anchor_App(void)
{
@@ -645,11 +646,11 @@
/*--------------------------以下为非测距逻辑------------------------*/
LED0_BLINK; //每成功一次通讯则闪烁一次
g_UWB_com_interval = 0;
- g_Resttimer=0;
+// g_Resttimer=0;
hex_dist = dist_cm+(int16_t)g_com_map[DIST_OFFSET]*10;
if(tag_id_recv-TAG_ID_START<=TAG_NUM_IN_SYS)
{
- if(abs(hex_dist-his_dist[tag_id_recv-TAG_ID_START])<15000||misdist_num[tag_id_recv-TAG_ID_START]>4)
+ if(abs(hex_dist-his_dist[tag_id_recv-TAG_ID_START])<dist_threshold||misdist_num[tag_id_recv-TAG_ID_START]>4)
{
int32_t filter_dist;
misdist_num[tag_id_recv-TAG_ID_START]=0;
--
Gitblit v1.9.3