From d93c5e1b77f58b19b6a7c26ddd7da05848bdd04c Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期五, 22 八月 2025 17:52:29 +0800
Subject: [PATCH] 2.18 每次清0基站数量
---
keil/uwb_app.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/keil/uwb_app.c b/keil/uwb_app.c
index 3e45e80..a342ee2 100644
--- a/keil/uwb_app.c
+++ b/keil/uwb_app.c
@@ -671,6 +671,7 @@
uwb_losttimer=g_com_map[UWB_RNAGE_TIME]+1;//防止溢出
}
extern uint16_t gaodu;
+extern uint8_t jingzhi_flag;
void UWBSendUDPTask(void)
{
uint16_t checksum,tempdistarray[20];
@@ -722,7 +723,7 @@
usart_send[7] = (tagseq++)>>8;
usart_send[8] = bat_percent;
// usart_send[8] = rxnum;
- usart_send[9] = userkey_state|0<<1|0<<2|0<<5|uwb_state<<6;
+ usart_send[9] = userkey_state|jingzhi_flag<<1|0<<2|0<<5|uwb_state<<6;
// memcpy(&usart_send[10],&rec_tagheight,2);
memcpy(&usart_send[12],gaodu,2);
// usart_send[12] = 0;
@@ -737,7 +738,7 @@
checksum = Checksum_u16(&usart_send[2],15+5*taglist_num);
memcpy(&usart_send[17+5*taglist_num],&checksum,2);
HexToAsciiSendUDP(usart_send,19+5*taglist_num);
-// taglist_num = 0;
+ taglist_num = 0;
// rxnum=0;
}
extern uint32_t step_count;
@@ -760,7 +761,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&&g_com_map[UWBENBLE]==1)
{
UWBSendUDPTask();
}
@@ -776,7 +777,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