From a14e9f3212743f0cc688099fd3d21636eade089d Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期四, 02 三月 2023 15:17:28 +0800
Subject: [PATCH] 1
---
源码/核心板/Src/application/dw_app.c | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
index c953fae..bce3bdd 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
@@ -1142,7 +1142,7 @@
extern u16 synclost_count;
uint32_t current_syncid=0xffffffff,synclost_timer;
extern u8 flag_syncbase,waitsync_flag;
-u8 tagpos_rec[50],tagpos_send[50],ancidlist_num;
+u8 tagpos_rec[50],tagpos_send[50],ancidlist_num,zero_matrix[100]={0};
u16 ancidlist_rec[20],ancidlist_send[20];
u16 recnearbaselist_id[30];
int32_t recnearbaselist_dist[30];
@@ -1183,18 +1183,35 @@
//if (anchor_type == rx_buffer[ANC_TYPE_IDX])
if(dev_id==anc_id_recv)
{
+ taglist_pos=CmpTagInList(tag_id_recv);
+ if(taglist_pos==taglist_num)
+ {
+ taglist_pos=taglist_num;
+ tagid_list[taglist_num++]=tag_id_recv;
+
+ new_tagid=1;
+ }else{
+ new_tagid=0;
+ }
+ tagofflinetime[taglist_pos]=0;
+
rec_nearbase_num=rx_buffer[NEARBASENUM_INDEX];
+ if(rec_nearbase_num>=30)
+ {
+ break;
+ }
battary = rx_buffer[BATTARY_IDX];
button = rx_buffer[BUTTON_IDX];
frame_seq_nb2 = rx_buffer[SEQUENCE_IDX];
tag_frequency = rx_buffer[NEARP_TAGFREQ_INDEX];
tag_slotpos = rx_buffer[NEARP_TAGSLOTPOS_INDEX];
+
////////////////基站汇总模式数据
- memcpy(&rec_tagheight,&rx_buffer[NEARBASEID_INDEX+rec_nearbase_num*6+4],2);
+ memcpy(&rec_tagheight,&rx_buffer[NEARBASEID_INDEX+rec_nearbase_num*6],2);
memcpy(&recnearbaselist_id,&rx_buffer[NEARBASEID_INDEX],rec_nearbase_num*2);
- memcpy(&recnearbaselist_dist,&rx_buffer[NEARBASEID_INDEX+rec_nearbase_num*2],rec_nearbase_num*4+4);
+ memcpy(&recnearbaselist_dist,&rx_buffer[NEARBASEID_INDEX+rec_nearbase_num*2],rec_nearbase_num*4);
usart_send[2] = 0x0c;//正常模式
- usart_send[3] = 15+8*(rec_nearbase_num+1);//数据段长度
+ usart_send[3] = 15+8*(rec_nearbase_num);//数据段长度
memcpy(&usart_send[4],&tag_id_recv,2);
usart_send[6] = rx_buffer[SEQUENCE_IDX];
usart_send[7] = rx_buffer[SEQUENCEH_IDX];
@@ -1205,14 +1222,15 @@
usart_send[13] = tag_slotpos;
usart_send[14] = 0;
usart_send[15] = 0;
- usart_send[16] = rec_nearbase_num+1;
+ usart_send[16] = rec_nearbase_num;
- memcpy(&usart_send[17],&recnearbaselist_id,2*rec_nearbase_num+2);
- memcpy(&usart_send[19+rec_nearbase_num*2],&recnearbaselist_dist,4*rec_nearbase_num+4);
-
- checksum = Checksum_u16(&usart_send[2],23+8*rec_nearbase_num);
- memcpy(&usart_send[25+8*rec_nearbase_num],&checksum,2);
- UART_PushFrame(usart_send,27+8*rec_nearbase_num);
+ memcpy(&usart_send[17],&recnearbaselist_id,2*rec_nearbase_num);
+ memcpy(&usart_send[17+rec_nearbase_num*2],&recnearbaselist_dist,4*rec_nearbase_num);
+ memcpy(&usart_send[17+rec_nearbase_num*6],zero_matrix,2*rec_nearbase_num);
+
+ checksum = Checksum_u16(&usart_send[2],15+8*rec_nearbase_num);
+ memcpy(&usart_send[17+8*rec_nearbase_num],&checksum,2);
+ UART_PushFrame(usart_send,19+8*rec_nearbase_num);
Anchor_RecPoll();
}
break;
@@ -1278,6 +1296,7 @@
memcpy(&usart_send[6],&tag_id_recv,2);
memcpy(&usart_send[8],&rx_buffer[10],9);
usart_send[17] = firstpath_power;
+ memcpy(&usart_send[18],&rx_buffer[19],2);
checksum = Checksum_u16(&usart_send[2],20);
memcpy(&usart_send[22],&checksum,2);
UART_PushFrame(usart_send,24);
@@ -1301,6 +1320,10 @@
temp_tagpos=round((float)(sync_timer%g_com_map[COM_INTERVAL])/slottime);
tagpos_rec[(u8)temp_tagpos]=1;
rec_nearbase_num=rx_buffer[NEARBASENUM_INDEX];
+ if(rec_nearbase_num>30)
+ {
+ break;
+ }
battary = rx_buffer[BATTARY_IDX];
button = rx_buffer[BUTTON_IDX];
frame_seq_nb2 = rx_buffer[SEQUENCE_IDX];
--
Gitblit v1.9.3