From a842ed1ea9caa76785625ad6b7728a919bb4ce2c Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期三, 02 七月 2025 18:49:01 +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 | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/keil/uwb_app.c b/keil/uwb_app.c
index 75ff6dd..2084bc7 100644
--- a/keil/uwb_app.c
+++ b/keil/uwb_app.c
@@ -670,6 +670,7 @@
if(uwb_losttimer>g_com_map[UWB_RNAGE_TIME])
uwb_losttimer=g_com_map[UWB_RNAGE_TIME]+1;//防止溢出
}
+extern uint16_t gaodu;
void UWBSendUDPTask(void)
{
uint16_t checksum,tempdistarray[20];
@@ -723,8 +724,9 @@
// usart_send[8] = rxnum;
usart_send[9] = userkey_state|0<<1|0<<2|0<<5|uwb_state<<6;
// memcpy(&usart_send[10],&rec_tagheight,2);
- usart_send[12] = 0;
- usart_send[13] = 0;
+ memcpy(&usart_send[12],gaodu,2);
+// usart_send[12] = 0;
+// usart_send[13] = 0;
usart_send[14] = 0;
usart_send[15] = 0;
usart_send[16] = taglist_num;
@@ -739,6 +741,7 @@
// rxnum=0;
}
extern uint32_t step_count;
+extern uint8_t uwb_OpenClose_flag;
void UWBIdleTask(void)
{
// if(receive_flag)
@@ -757,7 +760,7 @@
step_count = mir3da_get_step(); // 获取步数
uwbtasktimer = HIDO_TimerGetTick();
UWBOneSecondTask();
- if(g_com_map[UWBFrequency]==1)
+ if(g_com_map[UWBFrequency]==1&&uwb_OpenClose_flag==1)
{
UWBSendUDPTask();
}
@@ -770,9 +773,9 @@
extern uint8_t uwb_offtime_count;
int Anchor_App(void)
{
- uint8_t i;
- uint16_t tempid;
- uwb_offtime_count=0;
+ uint8_t i;
+ uint16_t tempid;
+ uwb_offtime_count=0;
#ifdef CEJU_ZIUMIAN
current_state = STATE_NORMAL;
#endif
--
Gitblit v1.9.3