From ff27ffd4106d12d68f4da4259279f948e512fc69 Mon Sep 17 00:00:00 2001 From: zhangbo <zhangbo@qq.com> Date: 星期四, 24 七月 2025 10:28:30 +0800 Subject: [PATCH] 修改网络类型切换,用宏定义控制网络切换,V2.13 --- keil/uwb_app.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/keil/uwb_app.c b/keil/uwb_app.c index d6f15cf..1b5c35d 100644 --- a/keil/uwb_app.c +++ b/keil/uwb_app.c @@ -145,7 +145,7 @@ // .phy_cfg.rx_ant_id = UWB_RX_ANT_3, /* UWB RX antenna port */ //}; #ifdef UWB_MK8000_XB -static struct mk_uwb_configure config = { + struct mk_uwb_configure config = { .phy_work_mode = (uint8_t)(PHY_TX | PHY_RX), .phy_cfg.ch_num = 5, /* Channel number. */ .phy_cfg.code_index = 9, /* TRX preamble code */ @@ -162,7 +162,7 @@ }; #endif #ifdef UWB_DW1000_MBXJZ_OLD -static struct mk_uwb_configure config = { + struct mk_uwb_configure config = { .phy_work_mode = (uint8_t)(PHY_TX | PHY_RX), .phy_cfg.ch_num = 5, /* Channel number. */ .phy_cfg.code_index = 9, /* TRX preamble code */ @@ -760,7 +760,7 @@ step_count = mir3da_get_step(); // 获取步数 uwbtasktimer = HIDO_TimerGetTick(); UWBOneSecondTask(); - if(g_com_map[UWBFrequency]==1&&uwb_OpenClose_flag==1) + if(g_com_map[UWBFrequency]==1&&uwb_OpenClose_flag==1&¤t_state==STATE_NORMAL) { UWBSendUDPTask(); } @@ -776,7 +776,7 @@ uint8_t i; uint16_t tempid; uwb_offtime_count=0; -#ifdef CEJU_ZIUMIAN +#ifdef CEJU_XIUMIAN current_state = STATE_NORMAL; #endif if(group_id==rx_buf[GROUP_ID_IDX]&&rx_buf[MESSAGE_TYPE_IDX] == MBX_POLL)//判断是否是和自己是同一组通讯的且为poll包 -- Gitblit v1.9.3