From 1f4cdd2361ab73f24f104d608421124140f54c51 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期二, 13 五月 2025 09:39:48 +0800
Subject: [PATCH] 未修改室内外版本
---
keil/uwb_app.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/keil/uwb_app.c b/keil/uwb_app.c
index b15bdfe..0778e45 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;
@@ -160,7 +161,7 @@
.phy_cfg.rx_ant_id = UWB_RX_ANT_3, /* UWB RX antenna port */
};
#endif
-#ifdef UWB_DW1000_MBXJZ
+#ifdef UWB_DW1000_MBXJZ_OLD
static struct mk_uwb_configure config = {
.phy_work_mode = (uint8_t)(PHY_TX | PHY_RX),
.phy_cfg.ch_num = 5, /* Channel number. */
@@ -756,7 +757,9 @@
{
uwbtasktimer = HIDO_TimerGetTick();
UWBOneSecondTask();
-// UWBSendUDPTask();
+ #ifdef UWB_CK
+ UWBSendUDPTask();
+ #endif
}
}
int uwb_app_poll(void)
@@ -768,6 +771,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
@@ -782,8 +787,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_SLEEP;
+
+
// for(i=0; i<rec_nearbase_num; i++)
// {
// if(rec_ancidlist[i] == dev_id)
--
Gitblit v1.9.3