From c653225a505eb47752ac707dc47f1b15385c81d8 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期五, 17 一月 2025 18:05:14 +0800
Subject: [PATCH] 加入标签电量的存储逻辑，和更新的逻辑，精简了代码函数封装
---
keil/uwb_app.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/keil/uwb_app.c b/keil/uwb_app.c
index 5aa320d..9ee2b38 100644
--- a/keil/uwb_app.c
+++ b/keil/uwb_app.c
@@ -469,6 +469,7 @@
{
tagid_list[j]=tagid_list[i];
tagdist_list[j] = tagdist_list[i];
+ anchordata_bat[j]=anchordata_bat[i];//电量随之更新
tagofflinetime[j++]=tagofflinetime[i];
}
}
@@ -547,7 +548,7 @@
&&!((end_receive_count-current_count_calibration<=MS_TO_PHY_TIMER_COUNT(200))||(end_receive_count+(UINT32_MAX-current_count_calibration)<=MS_TO_PHY_TIMER_COUNT(200))))
{
start_receive_count_calibration=current_count_calibration;//更新开始时间
-// MotorPoll();
+
if(secondtask_search_count++%2==0)
{
@@ -574,13 +575,13 @@
{
uwb_rx_force_off(1);
uwb_rx_flag=0;
- LOG_INFO(TRACE_MODULE_APP,"关闭uwb_rx\r\n");
+ //LOG_INFO(TRACE_MODULE_APP,"关闭uwb_rx\r\n");
}
void OpenUWB(void)
{
flag_temp1=uwb_rx(0, 0,range_timeout_us);//提交接收请求
uwb_rx_flag=1;
- LOG_INFO(TRACE_MODULE_APP,"打开uwb_rx\r\n");
+ //LOG_INFO(TRACE_MODULE_APP,"打开uwb_rx\r\n");
}
void UWBOneSecondTask(void)
{
@@ -603,12 +604,12 @@
// switch(wltag_state)
// {
// case RANGE:
-// if(HIDO_TimerGetTick()-wltag_uwbtimer>0&&uwb_rx_flag==0)
+// if(HIDO_TimerGetTick()-wltag_uwbtimer>2&&uwb_rx_flag==0)
// {
// wltag_uwbtimer = HIDO_TimerGetTick();
// OpenUWB();
// }
-// else if(HIDO_TimerGetTick()-wltag_uwbtimer>2&&uwb_rx_flag==1)
+// else if(HIDO_TimerGetTick()-wltag_uwbtimer>1&&uwb_rx_flag==1)
// {
// wltag_uwbtimer = HIDO_TimerGetTick();
// CloseUWB();
@@ -693,10 +694,12 @@
{
Anchor_RecNearPoll(i);
tagdist_list[taglist_pos]=rec_ancdistlist[i];
+ anchordata_bat[taglist_pos] = battary;//保存该基站电量
if(taglist_pos==taglist_num)// taglist_pos==taglist_num 说明这个基站不在当前列表中
{ //tempid==dev_id 说明基站下发测距报文有这个标签的信息
taglist_num++; //满足上述两种情况才会添加基站ID进入列表中，否则会出现标签不在基站列表中，标签也不响应的情况
tagid_list[taglist_pos] = tag_id_recv;
+
}
break;
}
--
Gitblit v1.9.3