From 4ac8869c86534136e97ed4bf738a83e65cdefafa Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期五, 14 三月 2025 10:31:03 +0800
Subject: [PATCH] 添加了新的协议内容,还添加了保留位

---
 keil/uwb_app.c |  520 +++++++++++++++++++++++----------------------------------
 1 files changed, 208 insertions(+), 312 deletions(-)

diff --git a/keil/uwb_app.c b/keil/uwb_app.c
index 636997d..1a2af2b 100644
--- a/keil/uwb_app.c
+++ b/keil/uwb_app.c
@@ -10,17 +10,10 @@
 #include "board.h"
 #include "lora_1268.h"
 #include "PCA9555.h"
+
 #define TAG_KEEPTIMES           30
 #define REPORT_TAG_KEEPTIMES     1
-/************************************信号量 *******************************************************/
-typedef enum {
-    UWB_STATE_IDLE,
-    UWB_TX_STATE_BUSY,
-    UWB_RX_STATE_BUSY
-} UWB_State_t;
-// 全局状态变量
-volatile UWB_State_t UWB_STATE = UWB_STATE_IDLE;
-/************************************信号量 *******************************************************/
+
 #define GROUP_NUM   3
 uint16_t group_min_dist[GROUP_NUM+1];
 
@@ -54,8 +47,7 @@
 //resp函数
 void PushAnchorDataArray(uint16_t ancid,int16_t dist,uint8_t battary);//找到自己的id信息对应位置更新自己的交互信息
 static void resp_msg_set_ts(uint8_t *ts_field, int64_t ts);//用来对应位置放入时间戳
-//static uint16_t tagid_list[TAG_NUM_IN_SYS];
-uint16_t tagid_list[TAG_NUM_IN_SYS];
+static uint16_t tagid_list[TAG_NUM_IN_SYS];
 uint16_t CmpTagInList(uint16_t tagid);
 uint8_t Anchor_RecNearPoll(uint8_t ancrec_nearbasepos);
 static uint8_t send_buffer[100];
@@ -91,12 +83,22 @@
 float *sts_rssi=NULL;
 uint8_t flag_recsuccess;
 
+
+/************************************信号量 *******************************************************/
+typedef enum {
+    UWB_STATE_IDLE,
+    UWB_TX_STATE_BUSY,
+    UWB_RX_STATE_BUSY
+} UWB_State_t;
+// 全局状态变量
+volatile UWB_State_t UWB_STATE = UWB_STATE_IDLE;
+/************************************信号量 *******************************************************/
 //**************************************************新增定义**********************************************************//
 /* Ranging period */
 #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 1800U //yuan750 7500Haoyong
+#define POLL_RX_TO_RESP_TX_DLY_US 550U //yuan750 7500Haoyong
 
 #define RESP_TX_TO_FINAL_RX_DLY_US 500U
 
@@ -115,7 +117,7 @@
 /* RX window open in advance */
 #define RX_WIN_IN_ADVANCE_US (150)
 
-#define DELAY_BETWEEN_TWO_FRAME_UUS 600
+#define DELAY_BETWEEN_TWO_FRAME_UUS 500
 
 /* Field index in frame */
 #define MSG_SEQ_NUM_IDX 2
@@ -273,16 +275,19 @@
 uint32_t range_timeout_us = 2000000;//yuan5000
 uint8_t flag_temp2,flag_temp1;
 uint16_t uwb_losttimer;
+uint16_t REV_RX_NUM;
+uint16_t REV_POLL_NUM;
+uint16_t REPLY_POLL_NUM;
+uint16_t ERR_RX_NUM;
 static void rx_int_callback(struct MAC_HW_REPORT_T *rx_report)
 {		uint8_t valid_sts=0;
     // Power off radio
     power_off_radio();
-    UWB_STATE=UWB_STATE_IDLE;
+
     /** UWB RX success */
     if (rx_report->err_code == UWB_RX_OK)
     {
-			  
-			  UWB_LED_ON;
+				UWB_STATE=UWB_STATE_IDLE;
         /* Received data does not contain FCS */
         rx_length = rx_report->pkt_len;
         memcpy(rx_buf, rx_report->pkt_data, rx_length);
@@ -292,9 +297,9 @@
         poll_rx_en_start_u32 = rx_rpt.timestamp - phy_shr_duration();
         poll_rx_ts_i64 = ranging_rx_time_correct(&rx_rpt);
         poll_rx_num++;
+				REV_RX_NUM++;
         rssi = rx_report->rssi;
         receive_flag=1;
-//			  UWB_LED_ON;
 				Anchor_App();
 			#ifdef STS_MODE
 				valid_sts= sts_valid_check();
@@ -314,6 +319,7 @@
     }
     else
     {
+			 
         /* UWB_PLD_ERR     payload error             */
         /* UWB_PHR_ERR     PHR error                 */
         /* UWB_SFD_ERR     Sfd error                 */
@@ -323,39 +329,34 @@
 			        temp_count= phy_timer_count_get();
         memcpy(&rx_rpt, rx_report, sizeof(struct MAC_HW_REPORT_T));
         rx_length = 0;
-			if(UWB_STATE==UWB_STATE_IDLE)
-			{
-				UWB_STATE=UWB_RX_STATE_BUSY;
-		  	OpenUWB();//再次开启UWB接收
-			}
-				
+			  ERR_RX_NUM++;
+			  UWB_STATE=UWB_STATE_IDLE;
+				if(UWB_STATE==UWB_STATE_IDLE)
+				{
+					UWB_STATE=UWB_RX_STATE_BUSY;
+					OpenUWB();//再次开启UWB接收
+				}
+			//	OpenUWB();//再次开启UWB接收
     }
-	
+//	OpenUWB();//再次开启UWB接收
 }
-
-uint8_t temp_tx_flag;
+uint16_t TX_CALL_POLL_NUM;
 /* TX done process handler. */
 static void tx_int_callback(struct MAC_HW_REPORT_T *tx_report)
 {
     // Power off radio
     power_off_radio();
     UWB_STATE=UWB_STATE_IDLE;
-				
     /** UWB TX success */
     if (tx_report->err_code == UWB_TX_OK)
     {
+			
         temp_count= phy_timer_count_get();
         temp_internal=temp_count;
         resp_tx_num++;
-
-				if(temp_tx_flag==1)
-				{
-				temp_tx_flag=0;
-//				UWB_LED_OFF;
+			  TX_CALL_POLL_NUM++;
 				UWB_STATE=UWB_RX_STATE_BUSY;
 			  OpenUWB();//再次开启UWB接收
-				}
-					
 			  //gpio_pin_clr(IO_PIN_5);
         //LOG_INFO(TRACE_MODULE_APP, "poll_rx_num is %d,resp_tx_num is %d\r\n",poll_rx_num,resp_tx_num);
     }
@@ -364,8 +365,7 @@
 static uint16_t anchordata_id[TAG_NUM_IN_SYS],anchordata_dist[TAG_NUM_IN_SYS];
 static uint8_t anchordata_bat[TAG_NUM_IN_SYS];
 uint8_t anchordata_num = 0;
-//static int32_t tagdist_list[TAG_NUM_IN_SYS];
-int32_t tagdist_list[TAG_NUM_IN_SYS];
+static int32_t tagdist_list[TAG_NUM_IN_SYS];
 uint16_t random_time;
 //anchor
 int32_t hist_dist;
@@ -396,7 +396,7 @@
 {   uint16_t i;
     for(i=0; i<taglist_num; i++)
     {
-        if(memcmp(&tagid,&anchordata_id[i],2)==0)
+        if(memcmp(&tagid,&tagid_list[i],2)==0)
             break;
     }
     if(i==taglist_num)
@@ -404,6 +404,8 @@
     //tagofflinetime[i] = 0;
     return i;
 }
+
+
 static void resp_msg_set_ts(uint8_t *ts_field, int64_t ts)
 {
     int i,ts2;
@@ -437,75 +439,14 @@
     taglist_num=j;
 }
 
-//void TagListUpdate(void)
-//{
-//    uint8_t i,j=0,k=0;
-//    for(i=0; i<anchordata_num; i++)
-//    {
-//        if(tagofflinetime[i]++<QUIT_SLOT_TIME)
-//        {
-//            anchordata_id[j]=anchordata_id[i];
-//            tagofflinetime[j++]=tagofflinetime[i];
-//        }
-//				//标签存活时间
-//				if(tagofflinetime[i]++<TAG_KEEPTIMES)
-//        {
-//            tagid_list[k]=tagid_list[i];
-//            tagdist_list[k] = tagdist_list[i];
-//            tagofflinetime[k++]=tagofflinetime[i];
-//        }
-//    }
-//    anchordata_num=j;
-//		taglist_num=k;
-//}
+
 //static uint8_t tagofflinetime[ANC_MAX_NUM];
-int flag1=0;
-uint32_t temp_count7;
-uint32_t timeceshi1;
-uint32_t timeceshi2;
+//int flag1=0;
+//uint32_t temp_count7;
+//uint32_t timeceshi1;
+//uint32_t timeceshi2;
+
 uint8_t position;
-//uint8_t Anchor_RecNearPoll(uint8_t ancrec_nearbasepos)//根据自己是否为新基站定制消息去发送,根据是否抢占判断
-//{
-//    temp_count2=poll_rx_en_start_u32;
-
-//    memcpy(&send_buffer[GROUP_ID_IDX],&group_id,1);//组id
-//    memcpy(&send_buffer[ANCHOR_ID_IDX],&dev_id,2);//自身id
-//    memcpy(&send_buffer[TAG_ID_IDX],&tag_id_recv,2);//接受者id
-//    send_buffer[MESSAGE_TYPE_IDX]=MBX_RESPONSE;
-
-// if(rec_nearbase_num == ancrec_nearbasepos)//抢占模式自己为新基站
-//    {
-//        random_time = (phy_timer_count_get()%100);//多基站抢占一个位置时避免一个也收不到的情况就每一个随机错开几十uS
-//        //resp_tx_time = (poll_rx_ts+((random_time+rec_nearbase_num*20 + POLL_RX_TO_RESP_TX_DLY_UUS+ancrec_nearbasepos*DELAY_BETWEEN_TWO_FRAME_UUS) * UUS_TO_DWT_TIME)) >> 8;//计算Response发送时间T3。
-//        // (resp_tx_en_start_u32) is the moment when TX enable
-//        resp_tx_en_start_u32 = poll_rx_en_start_u32+US_TO_PHY_TIMER_COUNT(20*rec_nearbase_num+POLL_RX_TO_RESP_TX_DLY_US+rec_nearbase_num*DELAY_BETWEEN_TWO_FRAME_UUS);//后面的需要根据已有基站数量进行更改,如果是抢占自己最后一个回复,要有底数
-//                                
-//                } else {
-//        //resp_tx_time = (poll_rx_ts + ((rec_nearbase_num*20+POLL_RX_TO_RESP_TX_DLY_UUS+ancrec_nearbasepos*DELAY_BETWEEN_TWO_FRAME_UUS) * UUS_TO_DWT_TIME)) >> 8;//计算Response发送时间T3。
-//       resp_tx_en_start_u32 = poll_rx_en_start_u32+US_TO_PHY_TIMER_COUNT(20*rec_nearbase_num+POLL_RX_TO_RESP_TX_DLY_US+rec_nearbase_num*DELAY_BETWEEN_TWO_FRAME_UUS);//后面的需要根据已有基站数量进行更改,如果是抢占自己最后一个回复,要有底数
-//                                //这里应该有问题问一下钟工
-//                }//此处设置绝对时间将poll u32改为phy_timer_count_get()
-//    temp_count7=resp_tx_en_start_u32;
-//    resp_tx_ts_i64 = ranging_tx_time_correct(resp_tx_en_start_u32 + phy_shr_duration());//修正时间戳
-//    /* Write all timestamps in the final message. See NOTE 8 below. */
-//    resp_msg_set_ts(&send_buffer[RESP_MSG_POLL_RX_TS_IDX], poll_rx_ts_i64);
-//    resp_msg_set_ts(&send_buffer[RESP_MSG_RESP_TX_TS_IDX], resp_tx_ts_i64);//此处时间戳int64直接转换为uint64不知道会不会有错误
-//    memcpy(&send_buffer[RESP_MSG_ANC_DISTOFFSET],&disoffset,2);//差个修正offset,修正有符号但是这个com表为无符号的,传过去直接赋给Int16_t相当于还原了
-//    temp_resp_i64=resp_tx_ts_i64;
-////    temp_count3= phy_timer_count_get();
-////                timeceshi2=phy_timer_count_get();
-//		//uint32_t time_add=1000;
-//		//resp_tx_en_start_u32=resp_tx_en_start_u32+time_add;	
-//		temp_count3= phy_timer_count_get();								
-//    flag1=uwb_tx(send_buffer, 40,1 ,resp_tx_en_start_u32);//立即发送测试size大小
-////    temp_count1=phy_timer_count_get();
-//                
-//    while(mac_is_busy());
-//		tagofflinetime[taglist_pos] = 0;
-//    gpio_pin_clr(SCL_PIN);
-//}
-//uint8_t temp_tx_flag;
-uint8_t buf_1[40];
 uint8_t Anchor_RecNearPoll(uint8_t ancrec_nearbasepos)//根据自己是否为新基站定制消息去发送,根据是否抢占判断
 {
     temp_count2=poll_rx_en_start_u32;
@@ -539,18 +480,19 @@
     temp_count3= phy_timer_count_get();
 //		temp_rx=uwb_rx(buf_1,0,10);
 //		CloseUWB();
-    UWB_STATE==UWB_TX_STATE_BUSY;
+//    UWB_STATE==UWB_TX_STATE_BUSY;
+//	  gpio_pin_set(IO_PIN_1);
+//		gpio_pin_clr(IO_PIN_1);		
     flag_temp2=uwb_tx(send_buffer, 40,1 ,resp_tx_en_start_u32);//立即发送测试size大小
 		
 		tagofflinetime[taglist_pos] = 0;//更新标签通信
     temp_count1=phy_timer_count_get();
-		temp_tx_flag=1;
-		Delay_Ms(2);
+//		temp_tx_flag=1;
+//		Delay_Ms(2);
 
 //    while(mac_is_busy());
 //    gpio_pin_clr(SCL_PIN);
 }
-
 uint16_t uwb_searchcount= 2000000;
 uint8_t flag_recsuccess;
 
@@ -564,192 +506,168 @@
 uint32_t UWB_fachu_count=0;
 uint32_t UWB_qiangzhanfachu_count=0;
 uint32_t UWB_1003_count,UWB_6666_count=0;
-//int UwbRange(void)
-//{
+int UwbRange(void)
+{
 
-//    uint8_t i;
-//    uint16_t tempid;
+    uint8_t i;
+    uint16_t tempid;
 
-//    mac_register_process_handler(tx_int_callback, rx_int_callback);
-//    receive_flag = 0;
-//		flag_recsuccess = 0;
+    mac_register_process_handler(tx_int_callback, rx_int_callback);
+    receive_flag = 0;
+		flag_recsuccess = 0;
 
-////    uwb_rxflag=uwb_rx(0, 0, range_timeout_us);//开启接收
+    uwb_rxflag=uwb_rx(0, 0, range_timeout_us);//开启接收
 
-//    uwb_rxflag_num1++;
-//  //  while(mac_is_busy());
-//  //  temp_count2=phy_timer_count_get();
-//		start_receive_count=phy_timer_count_get();
-//	poll_timeout=US_TO_PHY_TIMER_COUNT(range_timeout_us);//多一个多0.4ms默认0.4ms计算为0.125*4*100000,默认开启1mss
-//	end_receive_count=start_receive_count+poll_timeout;
-//	if(end_receive_count>=UINT32_MAX)
-//	{end_receive_count-=UINT32_MAX;}
-//	current_count=phy_timer_count_get();
-//			while(mac_is_busy())
+    uwb_rxflag_num1++;
+  //  while(mac_is_busy());
+  //  temp_count2=phy_timer_count_get();
+		start_receive_count=phy_timer_count_get();
+	poll_timeout=US_TO_PHY_TIMER_COUNT(range_timeout_us);//多一个多0.4ms默认0.4ms计算为0.125*4*100000,默认开启1mss
+	end_receive_count=start_receive_count+poll_timeout;
+	if(end_receive_count>=UINT32_MAX)
+	{end_receive_count-=UINT32_MAX;}
+	current_count=phy_timer_count_get();
+			while(mac_is_busy())
+        {
+//            IdleTask();
+            current_count=phy_timer_count_get();
+            if(current_count>end_receive_count&&current_count<end_receive_count+HALF_SECOND_TIME)//超时时间为4.992秒
+            {
+                    break;
+            }
+        }
+			
+    if(receive_flag==1)//成功接收
+    {
+		time_count_sdsj=phy_timer_count_get();
+//			 gpio_pin_set(IO_PIN_5);
+					
+//		gpio_pin_clr(IO_PIN_5);
+		#ifdef DEBUG_BOXING
+//		gpio_pin_set(IO_PIN_5);//测试
+//		gpio_pin_clr(IO_PIN_5);//测试
+		#endif
+//            timeceshi1=phy_timer_count_get();
+//            temp_count7=poll_rx_en_start_u32;
+        receive_flag=0;
+        if(group_id==rx_buf[GROUP_ID_IDX]&&rx_buf[MESSAGE_TYPE_IDX] == MBX_POLL)/*&&!memcmp(&rx_buf[TAG_ID_IDX],&g_com_map[BIND_DEV_ID],2)*///判断是否是和自己是同一组通讯的且为poll包
+        {  
+//						UWB_shoudao_count++;
+						flag_recsuccess = 1;
+//					  temp_count2=phy_timer_count_get();
+            frame_seq_nb2 = rx_buf[SEQUENCE_IDX];//获取包序
+            battary = rx_buf[BATTARY_IDX];
+            rec_nearbase_num=rx_buf[FZ_NEARBASENUM_INDEX];  //标签传过来的他与基站交互的基站id数目
+					
+					  //rec_nearbase_num=25;  
+					
+            memcpy(&tag_id_recv,&rx_buf[TAG_ID_IDX],2);
+            memcpy(rec_ancidlist,&rx_buf[FZ_NEARBASEID_INDEX],2*rec_nearbase_num);
+            memcpy(rec_ancdistlist,&rx_buf[FZ_NEARBASEID_INDEX+2*rec_nearbase_num],2*rec_nearbase_num);
+            // memcpy(&rec_antdelay,&rx_buf[FZ_NEARBASEID_INDEX+rec_nearbase_num*4],2);
+//            timeceshi1=phy_timer_count_get();
+//            temp_count7=poll_rx_en_start_u32;
+					  taglist_pos=CmpTagInList(tag_id_recv);
+            for(i=0; i<rec_nearbase_num; i++)
+            {
+							
+                if(rec_ancidlist[i] == dev_id)
+                {
+                    rec_ancdistlist[i]+=(int16_t)g_com_map[DIST_OFFSET];
+                    PushAnchorDataArray(tag_id_recv,rec_ancdistlist[i],battary);
+									  UWB_fachu_count++;
+//		#ifdef DEBUG_BOXING
+////		gpio_pin_clr(IO_PIN_5);//测试
+//		gpio_pin_set(IO_PIN_5);//测试
+//		#endif
+                }
+            }
+            for(i=0; i<rec_nearbase_num; i++)
+            {
+							    memcpy(&tempid,&rx_buf[FZ_NEARBASEID_INDEX+i*2],2);
+                    if(tempid==dev_id)
+                    {
+                        Anchor_RecNearPoll(i);
+							          tagdist_list[taglist_pos]=rec_ancdistlist[i];
+                        if(group_min_dist[group_id]>rec_ancdistlist[i])
+                        {
+                            group_min_dist[group_id] = rec_ancdistlist[i];
+                        }
+                        if(taglist_pos==taglist_num)// taglist_pos==taglist_num 说明这个基站不在当前列表中
+                        {   //tempid==dev_id 说明基站下发测距报文有这个标签的信息
+                            taglist_num++;          //满足上述两种情况才会添加基站ID进入列表中,否则会出现标签不在基站列表中,标签也不响应的情况
+                            tagid_list[taglist_pos] = tag_id_recv;
+                        }
+                        break;
+										}
+            }
+
+            if(i==rec_nearbase_num)
+            {
+							
+                seize_anchor=1;   //抢占anchor
+                Anchor_RecNearPoll(i);
+						  	UWB_qiangzhanfachu_count++;
+
+            }
+						recev_error_num=0;
+
+//            sleep_timer_start(__MS_TO_32K_CNT(UWB_DELAY_TIME_US));//测试
+//            LOG_INFO(TRACE_MODULE_APP,"标签ID:%X,距离: %d 信号强度:%d.\r\n",g_com_map[BIND_DEV_ID],distance,rssi);
+       
+				}
+      //  uwb_rxflag=uwb_rx(0, 0, range_timeout_us);
+    }    
+		#ifdef DEBUG_BOXING
+//		gpio_pin_clr(IO_PIN_5);//测试
+//		gpio_pin_set(IO_PIN_5);//测试
+		#endif
+	
+    delay_us(1);
+    uwb_rx_force_off(1);
+//		gpio_pin_clr(IO_PIN_5); 
+//		#ifdef DEBUG_BOXING
+//		gpio_pin_clr(IO_PIN_5);//测试.
+//		#endif
+//		if(!flag_recsuccess)
+//		{
+//			sleep_timer_start(__MS_TO_32K_CNT(UWB_DELAY_TIME_US-3));//测试
+//        LOG_INFO(TRACE_MODULE_APP,"测距失败,计数:%d\r\n",recev_error_num);
+//        if(recev_error_num++>5)
 //        {
-////            IdleTask();
-//            current_count=phy_timer_count_get();
-//            if(current_count>end_receive_count&&current_count<end_receive_count+HALF_SECOND_TIME)//超时时间为4.992秒
-//            {
-//                    break;
-//            }
+//            recev_error_num=0;
+//            UWB_work_state=SEARCH_DEV;
+//            uwb_searchcount = 0;
+//            search_open_flag = 1;
 //        }
-//			
-//    if(receive_flag==1)//成功接收
-//    {
-//		time_count_sdsj=phy_timer_count_get();
-////			 gpio_pin_set(IO_PIN_5);
-//					
-////		gpio_pin_clr(IO_PIN_5);
+//			}
 //		#ifdef DEBUG_BOXING
+//		gpio_pin_clr(IO_PIN_5);//测试
 ////		gpio_pin_set(IO_PIN_5);//测试
-////		gpio_pin_clr(IO_PIN_5);//测试
-//		#endif
-////            timeceshi1=phy_timer_count_get();
-////            temp_count7=poll_rx_en_start_u32;
-//        receive_flag=0;
-//        if(group_id==rx_buf[GROUP_ID_IDX]&&rx_buf[MESSAGE_TYPE_IDX] == MBX_POLL)/*&&!memcmp(&rx_buf[TAG_ID_IDX],&g_com_map[BIND_DEV_ID],2)*///判断是否是和自己是同一组通讯的且为poll包
-//        {  
-////						UWB_shoudao_count++;
-//						flag_recsuccess = 1;
-////					  temp_count2=phy_timer_count_get();
-//            frame_seq_nb2 = rx_buf[SEQUENCE_IDX];//获取包序
-//            battary = rx_buf[BATTARY_IDX];
-//            rec_nearbase_num=rx_buf[FZ_NEARBASENUM_INDEX];  //标签传过来的他与基站交互的基站id数目
-//					
-//					  //rec_nearbase_num=25;  
-//					
-//            memcpy(&tag_id_recv,&rx_buf[TAG_ID_IDX],2);
-//            memcpy(rec_ancidlist,&rx_buf[FZ_NEARBASEID_INDEX],2*rec_nearbase_num);
-//            memcpy(rec_ancdistlist,&rx_buf[FZ_NEARBASEID_INDEX+2*rec_nearbase_num],2*rec_nearbase_num);
-//            // memcpy(&rec_antdelay,&rx_buf[FZ_NEARBASEID_INDEX+rec_nearbase_num*4],2);
-////            timeceshi1=phy_timer_count_get();
-////            temp_count7=poll_rx_en_start_u32;
-//					  taglist_pos=CmpTagInList(tag_id_recv);
-//            for(i=0; i<rec_nearbase_num; i++)
-//            {
-//							
-//                if(rec_ancidlist[i] == dev_id)
-//                {
-//                    rec_ancdistlist[i]+=(int16_t)g_com_map[DIST_OFFSET];
-//                    PushAnchorDataArray(tag_id_recv,rec_ancdistlist[i],battary);
-//									  UWB_fachu_count++;
-////		#ifdef DEBUG_BOXING
-//////		gpio_pin_clr(IO_PIN_5);//测试
-////		gpio_pin_set(IO_PIN_5);//测试
-////		#endif
-//                }
-//            }
-//            for(i=0; i<rec_nearbase_num; i++)
-//            {
-//							    memcpy(&tempid,&rx_buf[FZ_NEARBASEID_INDEX+i*2],2);
-//                    if(tempid==dev_id)
-//                    {
-//                        Anchor_RecNearPoll(i);
-//							          tagdist_list[taglist_pos]=rec_ancdistlist[i];
-//                        if(group_min_dist[group_id]>rec_ancdistlist[i])
-//                        {
-//                            group_min_dist[group_id] = rec_ancdistlist[i];
-//                        }
-//                        if(taglist_pos==taglist_num)// taglist_pos==taglist_num 说明这个基站不在当前列表中
-//                        {   //tempid==dev_id 说明基站下发测距报文有这个标签的信息
-//                            taglist_num++;          //满足上述两种情况才会添加基站ID进入列表中,否则会出现标签不在基站列表中,标签也不响应的情况
-//                            tagid_list[taglist_pos] = tag_id_recv;
-//                        }
-//                        break;
-//										}
-//            }
-
-//            if(i==rec_nearbase_num)
-//            {
-//							
-//                seize_anchor=1;   //抢占anchor
-//                Anchor_RecNearPoll(i);
-//						  	UWB_qiangzhanfachu_count++;
-
-//            }
-//						recev_error_num=0;
-
-////            sleep_timer_start(__MS_TO_32K_CNT(UWB_DELAY_TIME_US));//测试
-////            LOG_INFO(TRACE_MODULE_APP,"标签ID:%X,距离: %d 信号强度:%d.\r\n",g_com_map[BIND_DEV_ID],distance,rssi);
-//       
-//				}
-//      //  uwb_rxflag=uwb_rx(0, 0, range_timeout_us);
-//    }    
-//		#ifdef DEBUG_BOXING
-////		gpio_pin_clr(IO_PIN_5);//测试
-////		gpio_pin_set(IO_PIN_5);//测试
-//		#endif
-//	
-//    delay_us(1);
-//    uwb_rx_force_off(1);
-////		gpio_pin_clr(IO_PIN_5); 
-////		#ifdef DEBUG_BOXING
-////		gpio_pin_clr(IO_PIN_5);//测试.
-////		#endif
-////		if(!flag_recsuccess)
-////		{
-////			sleep_timer_start(__MS_TO_32K_CNT(UWB_DELAY_TIME_US-3));//测试
-////        LOG_INFO(TRACE_MODULE_APP,"测距失败,计数:%d\r\n",recev_error_num);
-////        if(recev_error_num++>5)
-////        {
-////            recev_error_num=0;
-////            UWB_work_state=SEARCH_DEV;
-////            uwb_searchcount = 0;
-////            search_open_flag = 1;
-////        }
-////			}
-////		#ifdef DEBUG_BOXING
-////		gpio_pin_clr(IO_PIN_5);//测试
-//////		gpio_pin_set(IO_PIN_5);//测试
-////		#endif    
-//}
+//		#endif    
+}
 int Uwbinit(void)
 {
-		uwb_open();
-	#ifdef STS_MODE
- // Set STS key and IV
-    phy_sts_key_configure(&sts_iv_key);
-	
-	// which RX ports will be used for AoA/PDoA
-    phy_rx_ant_mode_set(RX_ANT_PORTS_COMBINATION);
-	#endif
-    // Set calibration parameters
+    uwb_open();
+        // Set calibration parameters
     uwb_calibration_params_set(config.phy_cfg.ch_num);
-	#ifndef STS_MODE
-   // set advanced parameters
-    struct PHY_ADV_CONFIG_T adv_config = {
+
+    // set advanced parameters
+     struct PHY_ADV_CONFIG_T adv_config = {
         .thres_fap_detect = 40,
         .nth_scale_factor = 4,
         .ranging_performance_mode = 0,
         .skip_weakest_port_en = 0,
     };
-	#else
-	 // set advanced parameters
-    struct PHY_ADV_CONFIG_T adv_config = {
-        .thres_fap_detect = 40,
-        .nth_scale_factor = 4,
-        .ranging_performance_mode = 3,
-        .skip_weakest_port_en = 0,
-    };
-	#endif
     phy_adv_params_configure(&adv_config);
 
     // uwb configure
     uwb_configure(config.phy_work_mode, board_param.tx_power_fcc[CALIB_CH(config.phy_cfg.ch_num)], &config.phy_cfg);
-		#if (defined STS_MODE) || (defined MK_MODE)
-		ranging_lib_init();
-		#endif
-    ranging_frame_type_set(config.phy_cfg.sts_pkt_cfg);
-		#ifdef STS_MODE
-		aoa_aux_info_set(AOA_AUX_ANT_IQ_RSSI_PDOA_AOA_FOM);
-    aoa_steering_vector_set((const float *)((uint32_t)((config.phy_cfg.ch_num == 9) ? svec_ch9_ptr : svec_ch5_ptr) | SRAM_BASE));
 
-    aoa_param_config();
-		
-		phy_rx_sts_switch_mode_set(config.phy_cfg.sts_pkt_cfg, STS_SWITCH_EVERY_4SYM, 0, 0);
-		#endif
-		mac_register_process_handler(tx_int_callback, rx_int_callback);//初始化回调
+    ranging_frame_type_set(config.phy_cfg.sts_pkt_cfg);
+
+    // Register rx interrupt callback function
+    mac_register_process_handler(tx_int_callback, rx_int_callback);
 }
 uint16_t g_com_receive_id;
 void CloseUWB(void)
@@ -791,10 +709,8 @@
 }
 enumwltagstate wltag_state=RANGE;
 uint32_t wltag_statetimer,wltag_uwbtimer;
-uint16_t time_flag;
 int uwb_app_poll(void)
 {
-	
 //	switch(wltag_state)
 //	{
 //		
@@ -802,8 +718,6 @@
 ////	time_flag=HIDO_TimerGetTick()-wltag_uwbtimer;
 //	if(HIDO_TimerGetTick()-wltag_uwbtimer>2&&uwb_rx_flag==0)
 //		{ 
-////			
-//		  
 //				UWB_LED_ON;
 //				wltag_uwbtimer = HIDO_TimerGetTick();
 //				if(UWB_STATE==UWB_STATE_IDLE)
@@ -812,7 +726,7 @@
 //					OpenUWB();
 //				}
 //		}
-//	else if(HIDO_TimerGetTick()-wltag_uwbtimer>1&&uwb_rx_flag==1)
+//		else if(HIDO_TimerGetTick()-wltag_uwbtimer>1&&uwb_rx_flag==1)
 //		{
 ////			time_flag=HIDO_TimerGetTick()-wltag_uwbtimer;
 //		  	UWB_LED_OFF;
@@ -856,16 +770,19 @@
 //		}
 //		break;
 //	}
-//	 UWBIdleTask();
+	 UWBIdleTask();
 }
+//uint16_t REV_RX_NUM;
+//uint16_t REV_POLL_NUM;
+//uint16_t REPLY_POLL_NUM;
 int Anchor_App(void)
 {
 				uint8_t i;
 				uint16_t tempid;
-			if(group_id==(rx_buf[GROUP_ID_IDX])&&rx_buf[MESSAGE_TYPE_IDX] == MBX_POLL)//判断是否是和自己是同一组通讯的且为poll包
-        {   
-						flag_recsuccess = 1;
+			if(group_id==rx_buf[GROUP_ID_IDX]&&rx_buf[MESSAGE_TYPE_IDX] == MBX_POLL)//判断是否是和自己是同一组通讯的且为poll包
+        {    flag_recsuccess = 1;
 						wltag_state=RANGE;//成功后从search切换为range
+					  REV_POLL_NUM++;
 						memcpy(&g_com_receive_id,&rx_buf[TAG_ID_IDX],2);
 					  //temp_count2=phy_timer_count_get();
 						uwb_losttimer=0;//成功测距清0 lost时间
@@ -877,20 +794,19 @@
             memcpy(rec_ancdistlist,&rx_buf[FZ_NEARBASEID_INDEX+2*rec_nearbase_num],2*rec_nearbase_num);
             memcpy(&rec_antdelay,&rx_buf[FZ_NEARBASEID_INDEX+rec_nearbase_num*4],2);
 						taglist_pos=CmpTagInList(tag_id_recv);
-            if(taglist_num>=ANC_MAX_NUM)
+                if(taglist_num>=ANC_MAX_NUM)
 										return 0;
-						for(i=0; i<rec_nearbase_num; i++)
+								 for(i=0; i<rec_nearbase_num; i++)
 								{
 										memcpy(&tempid,&rx_buf[FZ_NEARBASEID_INDEX+i*2],2);
 										if(tempid==dev_id)
 										{
-											  UWB_shoudao_count++;
 												Anchor_RecNearPoll(i);
 												tagdist_list[taglist_pos]=rec_ancdistlist[i];
-//											  UWB_LED_OFF;
 												if(taglist_pos==taglist_num)// taglist_pos==taglist_num 说明这个基站不在当前列表中
 												{   //tempid==dev_id 说明基站下发测距报文有这个标签的信息
 														taglist_num++;          //满足上述两种情况才会添加基站ID进入列表中,否则会出现标签不在基站列表中,标签也不响应的情况
+													  REPLY_POLL_NUM++;
 														tagid_list[taglist_pos] = tag_id_recv;
 												}
 												break;
@@ -902,12 +818,12 @@
                 }
 				}
 	else{
-	if(UWB_STATE==UWB_STATE_IDLE)
-	{
-	 UWB_STATE=UWB_RX_STATE_BUSY;
-	 OpenUWB();
-	}
-	}
+				if(UWB_STATE==UWB_STATE_IDLE)
+				{
+				UWB_STATE=UWB_RX_STATE_BUSY;
+				OpenUWB();
+				}
+			}
 				
 				
 }
@@ -1060,24 +976,4 @@
     }
     return 1;
 }
-//typedef enum {
-//    UWB_STATE_IDLE,UWB_STATE = UWB_RX_READY;
-//    UWB_TX_STATE_BUSY,
-//    UWB_RX_STATE_BUSY
-//} UWB_State_t;
-//void UWB_Process(void) {
-//    switch (UWB_STATE) {
-//        case UWB_STATE_IDLE:
-//               UWB_STATE = UWB_TX_STATE_BUSY;
-//            break;
 
-//        case UWB_TX_STATE_BUSY:
-
-//            break;
-
-//        case UWB_RX_STATE_BUSY:
-//            UWB_RX_Start();
-//            uwb_state = UWB_STATE_IDLE; // 进入 RX 后回到空闲状态
-//            break;
-//    }
-//}

--
Gitblit v1.9.3