From bddf0b37dfea62d0d3f7f5f8c180c24727665b68 Mon Sep 17 00:00:00 2001 From: WXK <287788329@qq.com> Date: 星期一, 26 五月 2025 09:59:25 +0800 Subject: [PATCH] Merge branch 'MK大工卡-低精度GPS-1/5HZ' of http://47.108.70.204:60062/r/ChinaUWBProject into MK大工卡-低精度GPS-1/5HZ --- keil/uwb_app.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/keil/uwb_app.c b/keil/uwb_app.c index 4dbf58a..1d3e2a4 100644 --- a/keil/uwb_app.c +++ b/keil/uwb_app.c @@ -740,6 +740,7 @@ // taglist_num = 0; // rxnum=0; } +extern uint32_t step_count; void UWBIdleTask(void) { // if(receive_flag) @@ -755,6 +756,7 @@ // } if(HIDO_TimerGetTick()-uwbtasktimer >=1) { + step_count = mir3da_get_step(); // 获取步数 uwbtasktimer = HIDO_TimerGetTick(); UWBOneSecondTask(); if(g_com_map[UWBFrequency]==1) @@ -773,7 +775,9 @@ uint8_t i; uint16_t tempid; uwb_offtime_count=0; - current_state = STATE_NORMAL; + #ifdef CEJU_ZIUMIAN + current_state = STATE_NORMAL; + #endif if(group_id==rx_buf[GROUP_ID_IDX]&&rx_buf[MESSAGE_TYPE_IDX] == MBX_POLL)//判断是否是和自己是同一组通讯的且为poll包 { flag_recsuccess = 1; wltag_state=RANGE;//成功后从search切换为range -- Gitblit v1.9.3