From a1750f172c28e19df54b6ca29ab5eb012a2373fe Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期四, 17 十月 2024 15:51:56 +0800
Subject: [PATCH] 加入低功耗,成功实现4G休眠唤醒,有小概率偶发性手环解绑后马达震动问题,打印log偶发性末尾输出有方块未解决

---
 keil/uwb_app.c |   56 ++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/keil/uwb_app.c b/keil/uwb_app.c
index 547ce27..4705551 100644
--- a/keil/uwb_app.c
+++ b/keil/uwb_app.c
@@ -79,7 +79,7 @@
 /* RX window open in advance */
 #define RX_WIN_IN_ADVANCE_US (150)
 
-#define DELAY_BETWEEN_TWO_FRAME_UUS 400
+#define DELAY_BETWEEN_TWO_FRAME_UUS 1400
 
 /* Field index in frame */
 #define MSG_SEQ_NUM_IDX 2
@@ -270,6 +270,8 @@
 uint16_t random_time;
 //anchor
 int32_t hist_dist;
+int16_t temp_recdist_before_offset;
+int16_t dist_temp;
 void PushAnchorDataArray(uint16_t ancid,int16_t dist,uint8_t battary)
 {
     uint8_t i;
@@ -290,8 +292,14 @@
     anchordata_dist[i] = dist;
     anchordata_bat[i] = battary;
     tagofflinetime[i]=0;//不断更新当前TAG对应离线时间
+		dist_temp=dist;
 //    if(dist>0)
+		if(temp_recdist_before_offset!=0&&distance!=0x1ffff)
+		{
     distance=dist*0.5+distance*0.5;
+		}else{
+			distance=dist;
+		}
 }
 uint16_t CmpTagInList(uint16_t tagid)
 {   uint16_t i;
@@ -344,11 +352,11 @@
         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 = random_time+poll_rx_en_start_u32+US_TO_PHY_TIMER_COUNT(20*rec_nearbase_num)+US_TO_PHY_TIMER_COUNT(POLL_RX_TO_RESP_TX_DLY_US)+rec_nearbase_num*US_TO_PHY_TIMER_COUNT(DELAY_BETWEEN_TWO_FRAME_UUS);//后面的需要根据已有基站数量进行更改,如果是抢占自己最后一个回复,要有底数
+        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)+US_TO_PHY_TIMER_COUNT(POLL_RX_TO_RESP_TX_DLY_US)+rec_nearbase_num*US_TO_PHY_TIMER_COUNT(DELAY_BETWEEN_TWO_FRAME_UUS);//后面的需要根据已有基站数量进行更改,自己非抢占
+       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()
 
@@ -364,8 +372,10 @@
     while(mac_is_busy());
     gpio_pin_clr(SCL_PIN);
 }
-uint16_t uwb_searchcount,range_timeout_us = 5000;
+uint32_t range_timeout_us = 5000;
+uint16_t uwb_searchcount;
 uint8_t flag_recsuccess;
+uint8_t flag_temp2,flag_temp1;
 extern uint8_t g_start_send_flag,search_open_flag = 1,link_success_flag;
 int UwbRange(void)
 {
@@ -399,8 +409,9 @@
 		flag_recsuccess = 0;
     temp_count3=phy_timer_count_get();
     gpio_pin_set(SCL_PIN);
-    uwb_rx(0, 0, range_timeout_us);//开启接收
-  //  while(mac_is_busy());
+    flag_temp1=uwb_rx(0, 0, range_timeout_us);//开启接收
+	
+   // 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
@@ -420,11 +431,13 @@
                     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包
-        {   flag_recsuccess = 1;
+        {    flag_recsuccess = 1;
+					 sleep_timer_start(__MS_TO_32K_CNT(UWB_DELAY_TIME_US));//测试
 					  temp_count2=phy_timer_count_get();
             frame_seq_nb2 = rx_buf[SEQUENCE_IDX];//获取包序
             battary = rx_buf[BATTARY_IDX];
@@ -436,7 +449,7 @@
             for(i=0; i<rec_nearbase_num; i++)
             {
                 if(rec_ancidlist[i] == dev_id)
-                {
+                {		temp_recdist_before_offset=rec_ancdistlist[i];
                     rec_ancdistlist[i]+=(int16_t)g_com_map[DIST_OFFSET];
                     PushAnchorDataArray(tag_id_recv,rec_ancdistlist[i],battary);
                 }
@@ -456,17 +469,18 @@
             {
                 seize_anchor=1;   //抢占anchor
                 Anchor_RecNearPoll(i);
-
             }
 						recev_error_num=0;
-            sleep_timer_start(__MS_TO_32K_CNT(UWB_DELAY_TIME_US));//测试
+           	range_timeout_us=5000;//恢复为5000进入range后
             LOG_INFO(TRACE_MODULE_APP,"标签ID:%X,距离: %d 信号强度:%d.\r\n",g_com_map[BIND_DEV_ID],distance,rssi);
         break;
 				}
     } else {
-			uwb_rx(0, 0, range_timeout_us);
+			flag_temp1=uwb_rx(0, 0, range_timeout_us);
     }
 	}
+		delay_us(1);
+		uwb_rx_force_off(1);
 		if(!flag_recsuccess)
 		{
 			sleep_timer_start(__MS_TO_32K_CNT(UWB_DELAY_TIME_US-3));//测试
@@ -479,7 +493,10 @@
             search_open_flag = 1;
         }
 			}
+
     gpio_pin_clr(SCL_PIN);
+			
+			return 0;
 }
 
 
@@ -515,7 +532,7 @@
     receive_flag = 0;
     temp_count3=phy_timer_count_get();
     gpio_pin_set(SCL_PIN);
-    uwb_rx(0, 0, RX_SYNC_WIN_US_TEMP);//开启接收
+    flag_temp2=uwb_rx(0, 0, RX_SYNC_WIN_US_TEMP);//开启接收
     start_receive_count=phy_timer_count_get();
     poll_timeout=US_TO_PHY_TIMER_COUNT(2000000);//多一个多0.4ms默认0.4ms计算为0.125*4*100000,默认开启1mss
     end_receive_count=start_receive_count+poll_timeout;
@@ -540,7 +557,10 @@
         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();
+            {   
+							  sleep_timer_start(__MS_TO_32K_CNT(UWB_DELAY_TIME_US-13));//测试
+								range_timeout_us=20000;//将下次range开启后超时时间设为20ms之后再range里恢复
+								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数目
@@ -552,6 +572,8 @@
                 {
                     if(rec_ancidlist[i] == dev_id)
                     {
+												temp_recdist_before_offset=rec_ancdistlist[i];
+												rec_ancdistlist[i]+=(int16_t)g_com_map[DIST_OFFSET];
                         PushAnchorDataArray(tag_id_recv,rec_ancdistlist[i],battary);
                     }
                 }
@@ -571,16 +593,18 @@
                     seize_anchor=1;   //抢占anchor
                     Anchor_RecNearPoll(i);
                 }
-                sleep_timer_start(__MS_TO_32K_CNT(UWB_DELAY_TIME_US));//测试
+                
                 gpio_pin_clr(SCL_PIN);//测试
+								LOG_INFO(TRACE_MODULE_APP,"标签ID:%X,距离: %d 信号强度:%d.\r\n",g_com_map[BIND_DEV_ID],distance,rssi);
                 return 1;//返回发送成功标志
             }
 
         }
 				temp_count3=phy_timer_count_get();
-        uwb_rx(0, 0, RX_SYNC_WIN_US_TEMP);//再次开启接收
-
+        flag_temp2=uwb_rx(0, 0, RX_SYNC_WIN_US_TEMP);//再次开启接收
     }
+		delay_us(2);
+		uwb_rx_force_off(1);
     // 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;//返回绑定失败标志

--
Gitblit v1.9.3