From f44a16e4dfb664beb54f523eedabf19322caab7c Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期二, 29 十月 2024 15:56:05 +0800
Subject: [PATCH] 车载手环V1.11版本，解决adc采集总是100%问题，修改gps串口判断部分逻辑，低功耗稳定版本
---
keil/uwb_app.c | 80 +++++++++++++++++++++++++++++-----------
1 files changed, 58 insertions(+), 22 deletions(-)
diff --git a/keil/uwb_app.c b/keil/uwb_app.c
index 547ce27..0010dbf 100644
--- a/keil/uwb_app.c
+++ b/keil/uwb_app.c
@@ -35,7 +35,7 @@
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;
-extern uint8_t gps_power_state,motor_power_state,uwb_state,air780_power_state,gps_success_state,chaging_state,changed_state,air780_success_state;
+extern uint8_t gps_power_state,motor_power_state,uwb_state,air780_power_state,gps_success_state,red_charge_state,green_charge_state,air780_success_state;
int poll_rx_num,resp_tx_num;
//resp函数
void PushAnchorDataArray(uint16_t ancid,int16_t dist,uint8_t battary);//找到自己的id信息对应位置更新自己的交互信息
@@ -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 600 //yuan1400
/* 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()
@@ -362,11 +370,15 @@
uwb_tx(send_buffer, 40,1 ,resp_tx_en_start_u32);//立即发送测试size大小
temp_count1=phy_timer_count_get();
while(mac_is_busy());
+ #ifdef BO_XING
gpio_pin_clr(SCL_PIN);
+ #endif
}
-uint16_t uwb_searchcount,range_timeout_us = 5000;
+uint32_t range_timeout_us = 5000;
+uint16_t uwb_searchcount;
uint8_t flag_recsuccess;
-extern uint8_t g_start_send_flag,search_open_flag = 1,link_success_flag;
+uint8_t flag_temp2,flag_temp1;
+extern uint8_t g_start_send_flag,search_open_flag = 1,link_success_flag,flag_secondtask;
int UwbRange(void)
{
uint8_t i;
@@ -398,9 +410,12 @@
receive_flag = 0;
flag_recsuccess = 0;
temp_count3=phy_timer_count_get();
+ #ifdef BO_XING
gpio_pin_set(SCL_PIN);
- uwb_rx(0, 0, range_timeout_us);//开启接收
- // while(mac_is_busy());
+ #endif
+ 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 +435,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 +453,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 +473,21 @@
{
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);
+ #ifdef BO_XING
+ gpio_pin_clr(SCL_PIN);
+ #endif
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 +500,10 @@
search_open_flag = 1;
}
}
- gpio_pin_clr(SCL_PIN);
+
+
+
+ return 0;
}
@@ -514,8 +538,10 @@
mac_register_process_handler(tx_int_callback, rx_int_callback);
receive_flag = 0;
temp_count3=phy_timer_count_get();
+ #ifdef BO_XING
gpio_pin_set(SCL_PIN);
- uwb_rx(0, 0, RX_SYNC_WIN_US_TEMP);//开启接收
+ #endif
+ 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 +566,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 +581,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,18 +602,23 @@
seize_anchor=1; //抢占anchor
Anchor_RecNearPoll(i);
}
- sleep_timer_start(__MS_TO_32K_CNT(UWB_DELAY_TIME_US));//测试
+ #ifdef BO_XING
gpio_pin_clr(SCL_PIN);//测试
+ #endif
+ 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);
+ #ifdef BO_XING
gpio_pin_clr(SCL_PIN);//测试
+ #endif
return 0;//返回绑定失败标志
}
//}
@@ -641,7 +677,7 @@
//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();//更新灯状态
+ // update_led_power_state();//更新灯状态
}
LOG_INFO(TRACE_MODULE_APP,"UWB状态：%d\r\n",UWB_work_state);
}
--
Gitblit v1.9.3