From 8c44ac4d11d4e72eba7fc0506b1b78ec86c33dda Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 13 十一月 2019 10:58:24 +0800
Subject: [PATCH] V1.7
---
源码/核心板/Src/application/dw_app.c | 6 +++---
1 files changed, 3 insertions(+), 3 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 9d3f1a4..d017aa1 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 ------------------------------------------*/
@@ -612,13 +612,13 @@
dis_after_filter=dist_cm;
hex_dist = dist_cm+(int16_t)g_com_map[DIST_OFFSET];
if(tag_id_recv-TAG_ID_START<=TAG_NUM_IN_SYS)
- if(abs(hex_dist-his_dist[tag_id_recv-TAG_ID_START])<1000)
+ if(abs(hex_dist-his_dist[tag_id_recv-TAG_ID_START])<1000&&hex_dist<100000&&hex_dist>-1000)
{
g_Tagdist[tag_id_recv-TAG_ID_START] = hex_dist;
anchor_dist_last_frm[tag_id_recv-TAG_ID_START] = hex_dist;
}
his_dist[tag_id_recv-TAG_ID_START]=hex_dist;
- g_Tagdist[tag_id_recv]= 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])
{
--
Gitblit v1.9.3