From af548df2969d4ea695979abc5fb97afae0c0c4d4 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期三, 18 十二月 2024 18:06:22 +0800
Subject: [PATCH] uwb发射的delay极限时间确定

---
 keil/uwb_app.c |   34 +++++++++++++++++++++++++++-------
 1 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/keil/uwb_app.c b/keil/uwb_app.c
index a5a38f3..8d8a0cc 100644
--- a/keil/uwb_app.c
+++ b/keil/uwb_app.c
@@ -78,7 +78,7 @@
 #define RANGING_PERIOD_MS (1000)
 
 /* This is the delay from Frame RX POLL frame to send RESP Frame */
-#define POLL_RX_TO_RESP_TX_DLY_US 2000U //yuan670 with urt 3000success
+#define POLL_RX_TO_RESP_TX_DLY_US 550U //yuan600 success 并且不卡busy
 
 #define RESP_TX_TO_FINAL_RX_DLY_US 500U
 
@@ -133,7 +133,7 @@
 //    .phy_cfg.sts_seglen = STS_SEGLEN_BPRF_64, /* Number of symbols in an STS segment       */
 //    .phy_cfg.rx_ant_id = UWB_RX_ANT_3,    /* UWB RX antenna port                       */
 //};
-#ifndef STS_MODE
+#ifdef DW1000
 static struct mk_uwb_configure config = {
     .phy_work_mode = (uint8_t)(PHY_TX | PHY_RX),
     .phy_cfg.ch_num = 5,                      /* Channel number.                           */
@@ -149,7 +149,7 @@
     .phy_cfg.sts_seglen = STS_SEGLEN_BPRF_64, /* Number of symbols in an STS segment       */
     .phy_cfg.rx_ant_id = UWB_RX_ANT_3,    /* UWB RX antenna port                       */
 };
-#else
+#elif defined STS_MODE
 static struct mk_uwb_configure config = {
     .phy_work_mode = (uint8_t)(PHY_TX | PHY_RX),
     .phy_cfg.ch_num = 5,                      /* Channel number.                           */
@@ -165,7 +165,6 @@
     .phy_cfg.sts_seglen = STS_SEGLEN_BPRF_64, /* Number of symbols in an STS segment       */
     .phy_cfg.rx_ant_id = UWB_RX_ANT_3,        /* UWB RX antenna port                       */
 };
-#endif
 /* Use the default key and IV specified in the IEEE 802.15.4z attachment */
 static struct UWB_STS_KEY_CONFIG_T sts_iv_key = {
     .sts_vcounter = 0x1F9A3DE4,
@@ -177,6 +176,24 @@
     .sts_key2 = 0xD1D336AA,
     .sts_key3 = 0x14148674,
 };
+#elif defined MK_MODE
+static struct mk_uwb_configure config = {
+    .phy_work_mode = (uint8_t)(PHY_TX | PHY_RX),
+    .phy_cfg.ch_num = 9,                      /* Channel number.                           */
+    .phy_cfg.code_index = 9,                  /* TX preamble code.                         */
+    .phy_cfg.mean_prf = MEAN_PRF_64M,         /* Data rate 6.8M                            */
+    .phy_cfg.data_bit_rate = DATA_BR_6M8,     /* data rate 6.8M.                           */
+    .phy_cfg.sync_sym = PREAM_LEN_128,        /* Preamble duration, length of preamble 128 */
+    .phy_cfg.sfd_sym = BPRF_NSFD2_8,          /* Identifier for SFD sequence               */
+    .phy_cfg.ranging_bit = 1,                 /* ranging bit set.                          */
+    .phy_cfg.trx_mode = TRX_MODE_15_4Z_BPRF,  /* IEEE802.15.4z - BPRF mode                 */
+    .phy_cfg.sts_pkt_cfg = STS_PKT_CFG_0,     /* SP0 Frame                                 */
+    .phy_cfg.sts_segnum = STS_SEGNUM_BPRF_1,  /* Number of STS segments in the frame       */
+    .phy_cfg.sts_seglen = STS_SEGLEN_BPRF_64, /* Number of symbols in an STS segment       */
+    .phy_cfg.rx_ant_id = UWB_RX_ANT_3,        /* UWB RX antenna port                       */
+};
+#endif
+
 static struct anchor_id_car{
  uint16_t anchor_new_id;
  uint16_t change_num;
@@ -458,7 +475,7 @@
     temp_resp_i64=resp_tx_ts_i64;
     temp_count3= phy_timer_count_get();
     flag_temp2=uwb_tx(send_buffer, 40,1 ,resp_tx_en_start_u32);//立即发送测试size大小
-    temp_count1=phy_timer_count_get();
+//    temp_count1=phy_timer_count_get();
     //while(mac_is_busy());
     gpio_pin_clr(SCL_PIN);
 }
@@ -535,6 +552,8 @@
 void UWBOneSecondTask(void)
 {
  uwb_losttimer++;
+	if(uwb_losttimer>g_com_map[UWB_RNAGE_TIME])
+		uwb_losttimer=g_com_map[UWB_RNAGE_TIME]+1;//防止溢出
 }
 void UWBIdleTask(void)
 {
@@ -595,8 +614,9 @@
 				uint16_t tempid;
 			if(group_id==rx_buf[GROUP_ID_IDX]&&rx_buf[MESSAGE_TYPE_IDX] == MBX_POLL)//判断是否是和自己是同一组通讯的且为poll包
         {    flag_recsuccess = 1;
+						wltag_state=RANGE;//成功后从search切换为range
 						memcpy(&g_com_receive_id,&rx_buf[TAG_ID_IDX],2);
-					  temp_count2=phy_timer_count_get();
+					  //temp_count2=phy_timer_count_get();
 						uwb_losttimer=0;//成功测距清0 lost时间
             frame_seq_nb2 = rx_buf[SEQUENCE_IDX];//获取包序
             battary = rx_buf[BATTARY_IDX];
@@ -802,7 +822,7 @@
 
     // uwb configure
     uwb_configure(config.phy_work_mode, board_param.tx_power_fcc[CALIB_CH(config.phy_cfg.ch_num)], &config.phy_cfg);
-		#ifdef STS_MODE
+		#if (defined STS_MODE) || (defined MK_MODE)
 		ranging_lib_init();
 		#endif
     ranging_frame_type_set(config.phy_cfg.sts_pkt_cfg);

--
Gitblit v1.9.3