From f821dce82730e142b3b655139a687f79aa3b89bb Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期三, 25 九月 2024 19:38:10 +0800
Subject: [PATCH] 加大了超时时间，去掉和手环校准
---
keil/uwb_tag_.c | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/keil/uwb_tag_.c b/keil/uwb_tag_.c
index f181d78..5f3ecee 100644
--- a/keil/uwb_tag_.c
+++ b/keil/uwb_tag_.c
@@ -25,14 +25,14 @@
#define POLL_DELAY 100U //yuan100U
/* Receive response timeout */
-#define RESP_RX_TIMEOUT_US 2000U //Yuan500 10mssuccess 300jixian
+#define RESP_RX_TIMEOUT_US 5000U //Yuan500 10mssuccess 300jixian
/* Field index in frame */
#define MSG_SEQ_NUM_IDX 2
#define FINAL_MSG_POLL_TX_TS_IDX 10
#define FINAL_MSG_RESP_RX_TS_IDX 14
#define FINAL_MSG_FINAL_TX_TS_IDX 18
-#define DELAY_DEFAULT 5000
+#define DELAY_DEFAULT 50000
#define DELAY_BETWEEN_TWO_FRAME_UUS 400
#define HALF_SECOND_TIME 62400000
@@ -403,8 +403,9 @@
temp_tag_num=0;//临时数量为0
poll_tx_en_start_u32 = phy_timer_count_get()+US_TO_PHY_TIMER_COUNT(POLL_DELAY);//发送必须要延时发送才可以用于测距否则立即发送会获取时间戳不对，需要计算程序运行时间，避免设置过去时间
tempflag=uwb_tx(uwb_sendbuffer,13+4*nearbase_num,1,poll_tx_en_start_u32);//立即发送
-
- //gpio_pin_set(IO_PIN_5);//测试
+ #ifdef BOXING
+ gpio_pin_set(IO_PIN_5);//测试
+ #endif
//LOG_INFO(TRACE_MODULE_APP, "进入测距",poll_tx_num,resp_rx_num,distance);
poll_tx_ts_i64 = ranging_tx_time_correct(poll_tx_en_start_u32 + phy_shr_duration());//修正时间戳
temp_count1=phy_timer_count_get();
@@ -455,8 +456,9 @@
}
tempflag=uwb_rx(0, 0, RESP_RX_TIMEOUT_US);//立即开启接受并设置0超时
- //gpio_pin_clr(IO_PIN_5);//测试
-
+ #ifdef BOXING
+ gpio_pin_clr(IO_PIN_5);//测试
+ #endif
}else if(receive_flag==2){//接收出错
receive_flag=0;
tempflag=uwb_rx(0, 0, RESP_RX_TIMEOUT_US);//立即开启接受并设置0超时
@@ -464,11 +466,15 @@
// while(mac_is_busy());
temp_count1=phy_timer_count_get();
}
- //gpio_pin_clr(IO_PIN_5);//测试
+ #ifdef BOXING
+ gpio_pin_clr(IO_PIN_5);//测试
+ #endif
}
+// delay_us(1);
+// uwb_rx_force_off(1);
//dwt_forecetrxoff();
CalculateDists(poll_tx_ts_i64); //计算距离并更新距离表
AnchorListUpdate();//更新存活基站列表
- Rank_ANchor_list_by_dis();//冒泡排序重新按距离重新排列基站列表最小距离存货基站放到最前面
+ // Rank_ANchor_list_by_dis();//冒泡排序重新按距离重新排列基站列表最小距离存货基站放到最前面
}
#endif
\ No newline at end of file
--
Gitblit v1.9.3