From 9b59e87d8280de129c18421b5d12cf96d0ea904e Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 03 九月 2024 10:28:06 +0800
Subject: [PATCH] V1.6 给客户测试

---
 keil/uwb_app.c |  230 ++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 137 insertions(+), 93 deletions(-)

diff --git a/keil/uwb_app.c b/keil/uwb_app.c
index 7bdaa49..5677682 100644
--- a/keil/uwb_app.c
+++ b/keil/uwb_app.c
@@ -31,7 +31,7 @@
 static uint16_t anc_id_recv,tag_id_recv;
 static int16_t rec_antdelay;
 extern uint32_t dev_id;
-static uint16_t taglist_num=0,taglist_pos,tmp_time;
+static uint16_t taglist_pos,tmp_time;
 extern uint16_t tag_frequency;
 extern uint16_t disoffset;
 static uint8_t frame_len,recpoll_len,current_syncid,new_tagid,seize_anchor,result,g_start_sync_flag;
@@ -50,7 +50,8 @@
 uint32_t temp_count2=0;
 uint32_t temp_count3=0;
 uint32_t temp_internal=0;
-int temp_flag,distance;
+int32_t distance;
+uint8_t taglist_num;
 extern uint8_t recev_error_num;
 
 extern Operation_step UWB_work_state;
@@ -86,11 +87,11 @@
 #define FINAL_MSG_RESP_RX_TS_IDX 14
 #define FINAL_MSG_FINAL_TX_TS_IDX 18
 #define DELAY_DEFAULT 1000
-#define HALF_SECOND_TIME 62400000
+#define HALF_SECOND_TIME 624000000
 /* Length of the common part of the message */
 #define MSG_COMMON_LEN 10
 
-#define UWB_DELAY_TIME_US 496
+#define UWB_DELAY_TIME_US 495
 static uint8_t receive_flag=0;
 struct mk_uwb_configure
 {
@@ -101,7 +102,7 @@
 /* Default communication configuration. */
 static struct mk_uwb_configure config = {
     .phy_work_mode = (uint8_t)(PHY_TX | PHY_RX),
-    .phy_cfg.ch_num = 9,                      /* Channel number.                           */
+    .phy_cfg.ch_num = 5,                      /* 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.                           */
@@ -142,9 +143,9 @@
 static uint32_t resp_tx_timeout;
 int64_t temp_resp_i64;
 /* 41 bits timestamps of frames transmission/reception. */
- int64_t poll_rx_ts_i64;
- int64_t resp_tx_ts_i64;
- int64_t final_rx_ts_i64;
+int64_t poll_rx_ts_i64;
+int64_t resp_tx_ts_i64;
+int64_t final_rx_ts_i64;
 
 /* Frame sequence number, incremented after each transmission. */
 static uint8_t frame_seq_nb = 0;
@@ -195,6 +196,7 @@
 }
 
 /* RX done process handler. */
+int8_t rssi;
 static void rx_int_callback(struct MAC_HW_REPORT_T *rx_report)
 {
     // Power off radio
@@ -212,6 +214,7 @@
         poll_rx_en_start_u32 = rx_rpt.timestamp - phy_shr_duration();
         poll_rx_ts_i64 = ranging_rx_time_correct(&rx_rpt);
         poll_rx_num++;
+        rssi = rx_report->rssi;
         receive_flag=1;
         recev_error_num=0;
     }
@@ -225,7 +228,7 @@
         /* UWB_STS_ERR     STS error                 */
         memcpy(&rx_rpt, rx_report, sizeof(struct MAC_HW_REPORT_T));
         rx_length = 0;
-        
+
     }
 }
 
@@ -251,6 +254,7 @@
 static int32_t tagdist_list[TAG_NUM_IN_SYS];
 uint16_t random_time;
 //anchor
+int32_t hist_dist;
 void PushAnchorDataArray(uint16_t ancid,int16_t dist,uint8_t battary)
 {
     uint8_t i;
@@ -271,7 +275,8 @@
     anchordata_dist[i] = dist;
     anchordata_bat[i] = battary;
     tagofflinetime[i]=0;//不断更新当前TAG对应离线时间
-    distance=dist;
+    if(dist>0)
+    distance=dist*0.5+distance*0.5;
 }
 uint16_t CmpTagInList(uint16_t tagid)
 {   uint16_t i;
@@ -336,11 +341,15 @@
     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();
-    temp_flag=uwb_tx(send_buffer, 40,1 ,resp_tx_en_start_u32);//立即发送测试size大小
+    uwb_tx(send_buffer, 40,1 ,resp_tx_en_start_u32);//立即发送测试size大小
     temp_count1=phy_timer_count_get();
     while(mac_is_busy());
     gpio_pin_clr(SCL_PIN);
 }
+uint16_t uwb_searchcount,uwb_timer_reload_value = 496;
+uint8_t range_success;
+uint32_t delay_time;
+extern uint8_t g_start_send_flag,search_open_flag = 1,link_success_flag;
 int UwbRange(void)
 {
     uint8_t i;
@@ -368,76 +377,100 @@
 
     // Register rx interrupt callback function
     mac_register_process_handler(tx_int_callback, rx_int_callback);
-
+    range_success = 0;
     receive_flag = 0;
     temp_count3=phy_timer_count_get();
     gpio_pin_set(SCL_PIN);
     uwb_rx(0, 0, RX_SYNC_WIN_US);//开启接收
-    while(mac_is_busy());
     temp_count2=phy_timer_count_get();
-//		start_receive_count=phy_timer_count_get();
-//	poll_timeout=rec_nearbase_num*US_TO_PHY_TIMER_COUNT(DELAY_BETWEEN_TWO_FRAME_UUS)+US_TO_PHY_TIMER_COUNT(DELAY_DEFAULT);//多一个多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(current_count<end_receive_count||current_count>end_receive_count+HALF_SECOND_TIME)//循环接受包体,若为124.8K则是+62400000
-//		{
-    if(receive_flag==1)//成功接收
+    start_receive_count=phy_timer_count_get();
+    poll_timeout=US_TO_PHY_TIMER_COUNT(5000);//多一个多0.4ms默认0.4ms计算为0.125*4*100000,默认开启1mss
+    end_receive_count=start_receive_count+poll_timeout;
+    if(end_receive_count>=UINT32_MAX)
     {
-
-        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包
-        {   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数目
-            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);
-            for(i=0; i<rec_nearbase_num; i++)
+        end_receive_count-=UINT32_MAX;
+    }
+    current_count=phy_timer_count_get();
+    while(current_count<end_receive_count||current_count>end_receive_count+HALF_SECOND_TIME)//循环接受包体,若为124.8K则是+62400000
+    {
+        current_count=phy_timer_count_get();
+        while(mac_is_busy())
+        {
+            current_count=phy_timer_count_get();
+            if(current_count>end_receive_count&&current_count<end_receive_count+HALF_SECOND_TIME)
             {
-                if(rec_ancidlist[i] == dev_id)
-                {
-                    PushAnchorDataArray(tag_id_recv,rec_ancdistlist[i],battary);
-                }
-            }
-            for(i=0; i<rec_nearbase_num; i++)
-            {
-                memcpy(&tempid,&rx_buf[FZ_NEARBASEID_INDEX+i*2],2);
-                if(tempid==dev_id)//也是比id如果有就更新没有就抢占
-                {
-                    seize_anchor=0;  //非抢占。已存在列表中
-                    Anchor_RecNearPoll(i);
                     break;
+            }
+        }
+        if(receive_flag==1)//成功接收
+        {
+            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包
+            {   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数目
+                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);
+                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);
+                    }
                 }
-            }
+                for(i=0; i<rec_nearbase_num; i++)
+                {
+                    memcpy(&tempid,&rx_buf[FZ_NEARBASEID_INDEX+i*2],2);
+                    if(tempid==dev_id)//也是比id如果有就更新没有就抢占
+                    {
+                        seize_anchor=0;  //非抢占。已存在列表中
+                        Anchor_RecNearPoll(i);
+                        break;
+                    }
+                }
 
-            if(i==rec_nearbase_num)
-            {
-                seize_anchor=1;   //抢占anchor
-                Anchor_RecNearPoll(i);
+                if(i==rec_nearbase_num)
+                {
+                    seize_anchor=1;   //抢占anchor
+                    Anchor_RecNearPoll(i);
+
+                }
+                range_success = 1;
+                sleep_timer_start(__MS_TO_32K_CNT(uwb_timer_reload_value));//测试
                 
+                 gpio_pin_clr(SCL_PIN);
+                delay_time = (current_count-start_receive_count)>>7;
+                
+                LOG_INFO(TRACE_MODULE_APP,"标签ID:%X,距离: %d 信号强度:%d. 等待时间%d\r\n",g_com_map[BIND_DEV_ID],distance,rssi,delay_time);
+                break;
             }
-
-        }      
-    }else{
-     
-        if(recev_error_num++>20)
-            {
-                recev_error_num=0;
-                UWB_work_state=SEARCH_DEV;
-            }
-    }        
-    sleep_timer_start(__MS_TO_32K_CNT(UWB_DELAY_TIME_US));//测试
-    gpio_pin_clr(SCL_PIN);
+        } else {
+                uwb_rx(0, 0, RX_SYNC_WIN_US);//再次开启接收
+        }
+    }
+   if(!range_success)
+   {
+        sleep_timer_start(__MS_TO_32K_CNT(UWB_DELAY_TIME_US-4));//测试
+        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;
+        }
+   }
+   
 }
 
 
 //主函数绑定接受逻辑
 int UwbSearch(void)
 {
-    
+
     uint8_t i;
     uint16_t tempid;
     // The following peripherals will be initialized in the uwb_open function
@@ -474,18 +507,19 @@
     {
         end_receive_count-=UINT32_MAX;
     }
-    
+    current_count=phy_timer_count_get();
     while(current_count<end_receive_count||current_count>end_receive_count+HALF_SECOND_TIME)//循环接受包体,若为124.8K则是+62400000
     {
         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)
             {
-                
+                    break;
             }
         }
-       
+
         temp_count2=phy_timer_count_get();
         if(receive_flag==1)//成功接收
         {
@@ -522,46 +556,48 @@
                     Anchor_RecNearPoll(i);
                 }
                 sleep_timer_start(__MS_TO_32K_CNT(UWB_DELAY_TIME_US));//测试
-                 gpio_pin_clr(SCL_PIN);//测试
-            return 1;//返回发送成功标志
+                gpio_pin_clr(SCL_PIN);//测试
+                return 1;//返回发送成功标志
             }
-           
+
         }
-        
-      uwb_rx(0, 0, RX_SYNC_WIN_US_TEMP);//再次开启接收
+
+        uwb_rx(0, 0, RX_SYNC_WIN_US_TEMP);//再次开启接收
 
     }
+    // LOG_INFO(TRACE_MODULE_APP,"超时定时器:%x,%x,%x\r\n",start_receive_count,end_receive_count,current_count);
     gpio_pin_clr(SCL_PIN);//测试
     return 0;//返回绑定失败标志
 }
 //}
 
 #define SEARCH_TIMESTEMP 120
-uint16_t uwb_searchcount;
-extern uint8_t g_start_send_flag,search_open_flag = 1,link_success_flag;
 void UWBPoll(void)
 {
-    switch(UWB_work_state) 
-        {
+    switch(UWB_work_state)
+    {
     case LINK_SUCCESS:
     {   //连接成功进行轮询测距
-        
-            uwb_led_on();
-            UwbRange();
-            uwb_led_off();
-        
+
+        uwb_led_on();
+        UwbRange();
+        uwb_led_off();
+
     }
     break;
     case SEARCH_DEV:
     {   //接包不成功或者通讯失败进入搜索模式
-        if(search_open_flag) 
-            {
-            first_search_flag=0;
+        if(search_open_flag)
+        {
+            LOG_INFO(TRACE_MODULE_APP,"开启搜索\r\n");
+            search_open_flag=0;
             uwb_led_on();
             link_success_flag=UwbSearch();//第一次开启接收2s绑定失败后则进行下面1分钟后重新开启2s绑定流程
             uwb_led_off();
             if(link_success_flag)
                 UWB_work_state=LINK_SUCCESS;
+        }else{
+            LOG_INFO(TRACE_MODULE_APP,"等待进入搜索模式:%d\r\n",SEARCH_TIMESTEMP-uwb_searchcount);
         }
 
     }
@@ -573,25 +609,33 @@
     break;
     }
     if(UWB_work_state==LINK_SUCCESS)
-        { //成功时清0错误计数
-        uwb_searchcount=0;      
+    {   //成功时清0错误计数
+        uwb_searchcount=0;
     }
     if(UWB_work_state==SEARCH_DEV)
-        {
+    {
         if(!search_open_flag)
-        {            
+        {
             if(uwb_searchcount++>SEARCH_TIMESTEMP)
-                {
-                    uwb_searchcount=0;
-                    search_open_flag=1;
-                }
+            {
+                uwb_searchcount=0;
+                search_open_flag=1;
+            }
         }
         //link_error_count+=g_com_map[COM_INTERVAL];
         //if(link_error_count>=g_com_map[4G_INTERNAL])
         //link_error_count=0;
         update_led_power_state();//更新灯状态
     }
+     LOG_INFO(TRACE_MODULE_APP,"UWB状态:%d\r\n",UWB_work_state);
 }
 
-
+uint8_t GetUWBBindState(void)
+{
+    if(UWB_work_state == UN_BIND)
+    {
+        return 0;
+    }
+    return 1;
+}
 

--
Gitblit v1.9.3