From 65f1d70842d83f92aa31d79c97e364b4b0fd9ab6 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 20 五月 2025 09:39:51 +0800
Subject: [PATCH] 加入气压计驱动 空间不够报错
---
keil/uwb_app.c | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/keil/uwb_app.c b/keil/uwb_app.c
index 673eb2e..cd237a8 100644
--- a/keil/uwb_app.c
+++ b/keil/uwb_app.c
@@ -64,6 +64,7 @@
int16_t elevation = 0;
int16_t azimuth = 0;
uint8_t fom = 0;
+extern CountState_t current_state;
int32_t distance;
uint8_t taglist_num;
float *sts_rssi=NULL;
@@ -358,9 +359,7 @@
Anchor_App();
if(resp_tx_flag==0)
{
-
OpenUWB();
-
}
// #ifdef STS_MODE
// valid_sts= sts_valid_check();
@@ -711,8 +710,8 @@
// }
// Set4LEDColor(uwbled,rtkled,led4g,powerled);
- if(taglist_num>20) //最多上传20个基站数据，距离最近的20个
- taglist_num = 20;
+ if(taglist_num>14) //最多上传20个基站数据，距离最近的20个
+ taglist_num = 14;
usart_send[0]= 0x55;
usart_send[1]= 0xaa;
usart_send[2] = 0x12;//正常模式
@@ -756,9 +755,10 @@
{
uwbtasktimer = HIDO_TimerGetTick();
UWBOneSecondTask();
- #ifdef UWB_CK
+ if(g_com_map[UWBFrequency]==1)
+ {
UWBSendUDPTask();
- #endif
+ }
}
}
int uwb_app_poll(void)
@@ -770,6 +770,8 @@
{
uint8_t i;
uint16_t tempid;
+ uwb_offtime_count=0;
+ current_state = STATE_NORMAL;
if(group_id==rx_buf[GROUP_ID_IDX]&&rx_buf[MESSAGE_TYPE_IDX] == MBX_POLL)//判断是否是和自己是同一组通讯的且为poll包
{ flag_recsuccess = 1;
wltag_state=RANGE;//成功后从search切换为range
@@ -784,8 +786,8 @@
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);
uwbled=BLUE;
- uwb_offtime_count=0;
- CountState_t current_state = STATE_NORMAL;
+
+
// for(i=0; i<rec_nearbase_num; i++)
// {
// if(rec_ancidlist[i] == dev_id)
--
Gitblit v1.9.3