From cba4dbb02fc442a8e238d2dabb389e1e5e8185f6 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 13 十一月 2019 17:02:16 +0800
Subject: [PATCH] 测距异常值bug没找到原因
---
源码/核心板/Src/application/dw_app.c | 12 ++++++++----
1 files changed, 8 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 4c8db75..6ac274f 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"
@@ -145,7 +145,7 @@
float dis_after_filter; //当前距离值
LPFilter_Frac* p_Dis_Filter; //测距用的低通滤波器
-uint16_t g_Tagdist[TAG_NUM_IN_SYS];
+int32_t g_Tagdist[TAG_NUM_IN_SYS];
uint8_t g_flag_Taggetdist[256];
/*------------------------------------ Functions ------------------------------------------*/
@@ -611,14 +611,17 @@
g_UWB_com_interval = 0;
dis_after_filter=dist_cm;
hex_dist = dist_cm+(int16_t)g_com_map[DIST_OFFSET];
+ if(hex_dist<100000&&hex_dist>-1000)
+ {
if(tag_id_recv-TAG_ID_START<=TAG_NUM_IN_SYS)
- if(abs(hex_dist-his_dist[tag_id_recv-TAG_ID_START])<1000&&hex_dist<100000)
+ {
+ if(abs(hex_dist-his_dist[tag_id_recv-TAG_ID_START])<1000)
{
g_Tagdist[tag_id_recv-TAG_ID_START] = hex_dist;
anchor_dist_last_frm[tag_id_recv-TAG_ID_START] = hex_dist;
+ g_Tagdist[tag_id_recv]= hex_dist;
}
his_dist[tag_id_recv-TAG_ID_START]=hex_dist;
- g_Tagdist[tag_id_recv]= anchor_dist_last_frm[tag_id_recv-TAG_ID_START];
g_flag_Taggetdist[tag_id_recv]=0;
if(!g_com_map[MODBUS_MODE])
{
@@ -639,7 +642,8 @@
Modbus_HoldReg[tag_id_recv*2]=anchor_dist_last_frm[tag_id_recv-TAG_ID_START]>>16;
Modbus_HoldReg[tag_id_recv*2+1]=anchor_dist_last_frm[tag_id_recv-TAG_ID_START];
//dis_after_filter = LP_Frac_Update(p_Dis_Filter, dist_cm);
-
+ }
+ }
}
}else{
/* Clear RX error events in the DW1000 status register. */
--
Gitblit v1.9.3