From f77c0cc249fd31530fb90cdfb19093695553d0bc Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 27 四月 2021 21:55:34 +0800
Subject: [PATCH] V2.18 基本没问题
---
源码/核心板/Src/application/dw_app.c | 10 ++++++----
1 files changed, 6 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 c9eaf86..8562149 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"
@@ -47,7 +47,7 @@
uint32_t g_UWB_com_interval = 0;
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];
static uint64_t get_tx_timestamp_u64(void)
@@ -97,6 +97,7 @@
*ts += ts_field[i] << (i * 8);
}
}
+extern int32_t tagdist_list[TAG_NUM_IN_SYS];
void TagDistClear(void)
{
static uint16_t clear_judge_cnt;
@@ -109,7 +110,7 @@
g_flag_Taggetdist[i]++;
if(g_flag_Taggetdist[i]>=2)
{
- g_Tagdist[i]=0xffff;
+ tagdist_list[i]=0x1ffff;
}
}
}
@@ -934,7 +935,7 @@
dwt_setdelayedtrxtime(resp_tx_time);//设置Response发送时间T3
dwt_setrxaftertxdelay(RESP_TX_TO_FINAL_RX_DLY_UUS+(rec_nearbase_num+1-ancrec_nearbasepos)*DELAY_BETWEEN_TWO_FRAME_UUS);//设置发送完成后开启接收延迟时间
dwt_setrxtimeout(FINAL_RX_TIMEOUT_UUS);//接收超时时间
- dwt_readdiagnostics(&d1);
+ //dwt_readdiagnostics(&d1);
if(new_tagid)
{
@@ -1044,9 +1045,10 @@
LED0_BLINK; //每成功一次通讯则闪烁一次
dis_after_filter=dist_cm;
hex_dist = dist_cm+(int16_t)g_com_map[DIST_OFFSET];
- g_flag_Taggetdist[taglist_pos]=0;
+
if(hex_dist>-1000&&hex_dist<200000)
{
+ g_flag_Taggetdist[taglist_pos]=0;
if(abs(hex_dist-his_dist[taglist_pos])<1500||misdist_num[taglist_pos]>3)
{
misdist_num[taglist_pos]=0;
--
Gitblit v1.9.3