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 | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/keil/uwb_app.c b/keil/uwb_app.c
index 0cab9c7..4705551 100644
--- a/keil/uwb_app.c
+++ b/keil/uwb_app.c
@@ -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,9 @@
anchordata_dist[i] = dist;
anchordata_bat[i] = battary;
tagofflinetime[i]=0;//不断更新当前TAG对应离线时间
+ dist_temp=dist;
// if(dist>0)
- if(distance!=0x1ffff&&distance!=0)
+ if(temp_recdist_before_offset!=0&&distance!=0x1ffff)
{
distance=dist*0.5+distance*0.5;
}else{
@@ -372,7 +375,7 @@
uint32_t range_timeout_us = 5000;
uint16_t uwb_searchcount;
uint8_t flag_recsuccess;
-uint8_t flag_temp2;
+uint8_t flag_temp2,flag_temp1;
extern uint8_t g_start_send_flag,search_open_flag = 1,link_success_flag;
int UwbRange(void)
{
@@ -406,7 +409,7 @@
flag_recsuccess = 0;
temp_count3=phy_timer_count_get();
gpio_pin_set(SCL_PIN);
- flag_temp2=uwb_rx(0, 0, range_timeout_us);//开启接收
+ flag_temp1=uwb_rx(0, 0, range_timeout_us);//开启接收
// while(mac_is_busy());
// temp_count2=phy_timer_count_get();
@@ -433,7 +436,7 @@
{
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];//获取包序
@@ -446,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);
}
@@ -473,7 +476,7 @@
break;
}
} else {
- flag_temp2=uwb_rx(0, 0, range_timeout_us);
+ flag_temp1=uwb_rx(0, 0, range_timeout_us);
}
}
delay_us(1);
@@ -555,7 +558,7 @@
{
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包
{
- sleep_timer_start(__MS_TO_32K_CNT(UWB_DELAY_TIME_US-15));//测试
+ 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];//获取包序
@@ -569,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);
}
}
@@ -590,15 +595,15 @@
}
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();
flag_temp2=uwb_rx(0, 0, RX_SYNC_WIN_US_TEMP);//再次开启接收
-
}
- delay_us(1);
+ 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);//测试
--
Gitblit v1.9.3