From f3a6daa409dfb287e517cf792a425435038e44df Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 18 五月 2021 16:26:09 +0800
Subject: [PATCH] 修改基站类型未附值BUG
---
源码/核心板/Src/application/dw_app.c | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 20d2622..daa6f7b 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"
@@ -240,7 +240,7 @@
for(i=0;i<100;i++)
{
g_flag_Taggetdist[i]++;
- if(g_flag_Taggetdist[i]>=2)
+ if(g_flag_Taggetdist[i]>=5)
{
g_Tagdist[i]=0xffff;
Modbus_HoldReg[i*2]=1;
@@ -339,7 +339,6 @@
u8 bat_percent;
//LED0_ON;
dwt_forcetrxoff();
- g_Resttimer=0;
dwt_setrxaftertxdelay(POLL_TX_TO_RESP_RX_DLY_UUS); //设置发送后开启接收，并设定延迟时间
dwt_setrxtimeout(RESP_RX_TIMEOUT_UUS);
tag_succ_times = 0;
@@ -443,13 +442,13 @@
tag_succ_times++;
LED0_BLINK;
-
+ g_Resttimer=0;
memcpy(&anc_id_recv,&rx_buffer[ANCHOR_ID_IDX],2);
if(hex_dist2!=0xffff)
{
g_Tagdist[anc_id_recv]= hex_dist2;
g_flag_Taggetdist[anc_id_recv]=0;
-
+
if(!g_com_map[MODBUS_MODE])
{
hex_dist2 = hex_dist2;
@@ -470,7 +469,9 @@
// memcpy(&Modbus_HoldReg[anc_id_recv*2],&hex_dist,4);
/* Poll DW1000 until TX frame sent event set. See NOTE 8 below. */
if(result==0)
- {while (!(dwt_read32bitreg(SYS_STATUS_ID) & SYS_STATUS_TXFRS))//不断查询芯片状态直到发送完成
+ {
+
+ while (!(dwt_read32bitreg(SYS_STATUS_ID) & SYS_STATUS_TXFRS))//不断查询芯片状态直到发送完成
{ };
}
/* Clear TXFRS event. */
@@ -507,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)
{
@@ -522,7 +524,6 @@
while (!((status_reg = dwt_read32bitreg(SYS_STATUS_ID)) & (SYS_STATUS_RXFCG | SYS_STATUS_ALL_RX_ERR))&&!g_start_send_flag&&!g_start_sync_flag)//不断查询芯片状态直到接收成功或者出现错误
{
IdleTask();
- g_Resttimer=0;
};
if (status_reg & SYS_STATUS_RXFCG)//成功接收
@@ -645,11 +646,11 @@
/*--------------------------以下为非测距逻辑------------------------*/
LED0_BLINK; //每成功一次通讯则闪烁一次
g_UWB_com_interval = 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