From 0382082159710bfd226723dfd54cae09b2668423 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 15 十一月 2021 11:56:00 +0800
Subject: [PATCH] V1.61
---
源码/核心板/Src/application/dw_app.c | 57 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 33 insertions(+), 24 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 e135500..6b63b94 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"
@@ -317,6 +317,7 @@
}
void OutputUserData(u16 devid,u8* addr,u8 len)
{
+ len++;
usart_send[2] = 0x11;//正常模式
usart_send[3] = len+4;//数据段长度
memcpy(&usart_send[4],&devid,2);
@@ -327,8 +328,8 @@
}
u8 test=0;
u8 anclost_times=0;
-u8 exsistbase_list[MAX_NEARBASE_NUM],report_num,get_newbase=0;
-u16 temp_sync_timer1,temp_sync_timer2;
+u8 exsistbase_list[MAX_NEARBASE_NUM],report_num,get_newbase=0,temp_sendlen;
+u16 temp_sync_timer1,temp_sync_timer2,rec_userdata_targetid;
extern u8 userdata[50];
u8 tagrec_userdata[20],tagrec_datalen;
extern u32 getuserdata_tick;
@@ -360,15 +361,17 @@
memcpy(&tx_nearpoll_msg[NEARBASEID_INDEX],&nearbaseid_list,nearbase_num*2);
tx_nearpoll_msg[MESSAGE_TYPE_IDX] = NEAR_POLL;
memcpy(&tx_nearpoll_msg[ANCHOR_ID_IDX],&mainbase_id,2);
-
+ temp_sendlen = 0;
if(time32_incr-getuserdata_tick<500)
- {memcpy(&tx_nearpoll_msg[NEARBASEID_INDEX+nearbase_num*2],userdata,USERDATA_LEN+1);
+ {
+ temp_sendlen +=7;
+ memcpy(&tx_nearpoll_msg[NEARBASEID_INDEX+nearbase_num*2],userdata,USERDATA_LEN+3);
}else{
- userdata[0] = 0;
+ tx_nearpoll_msg[NEARBASEID_INDEX+nearbase_num*2] = 0;
}
- dwt_writetxdata(14+userdata[0]+2*nearbase_num, tx_nearpoll_msg, 0);//将Poll包数据传给DW1000，将在开启发送时传出去
- dwt_writetxfctrl(14+userdata[0]+2*nearbase_num, 0);//设置超宽带发送数据长度
+ dwt_writetxdata(13+temp_sendlen+2*nearbase_num, tx_nearpoll_msg, 0);//将Poll包数据传给DW1000，将在开启发送时传出去
+ dwt_writetxfctrl(13+temp_sendlen+2*nearbase_num, 0);//设置超宽带发送数据长度
dwt_starttx(DWT_START_TX_IMMEDIATE | DWT_RESPONSE_EXPECTED);//开启发送，发送完成后等待一段时间开启接收，等待时间在dwt_setrxaftertxdelay中设置
flag_finalsend=0;
@@ -456,10 +459,11 @@
rec_nearbasepos=0;
memcpy(&temp_dist,&rx_buffer[DIST_IDX],4);
- tagrec_datalen = rx_buffer[RT_USERDATA_INDEX];
- if(tagrec_datalen==USERDATA_LEN)
+ tagrec_datalen = rx_buffer[RT_USERDATA_INDEX+2];
+ memcpy(&rec_userdata_targetid,&rx_buffer[RT_USERDATA_INDEX],2);
+ if(tagrec_datalen==USERDATA_LEN&&rec_userdata_targetid==dev_id)
{
- memcpy(tagrec_userdata,&rx_buffer[RT_USERDATA_INDEX],tagrec_datalen+1);
+ memcpy(tagrec_userdata,&rx_buffer[RT_USERDATA_INDEX+2],tagrec_datalen+1);
OutputUserData(rec_nearbaseid,tagrec_userdata,tagrec_datalen);
}
nearbase_distlist[rec_nearbasepos]=temp_dist;
@@ -520,12 +524,13 @@
}
memcpy(&temp_dist,&rx_buffer[DIST_IDX],4);
- tagrec_datalen = rx_buffer[RT_USERDATA_INDEX];
- if(tagrec_datalen==USERDATA_LEN)
- {
- memcpy(tagrec_userdata,&rx_buffer[RT_USERDATA_INDEX],tagrec_datalen+1);
- OutputUserData(rec_nearbaseid,tagrec_userdata,tagrec_datalen);
- }
+ tagrec_datalen = rx_buffer[RT_USERDATA_INDEX+2];
+ memcpy(&rec_userdata_targetid,&rx_buffer[RT_USERDATA_INDEX],2);
+ if(tagrec_datalen==USERDATA_LEN&&rec_userdata_targetid==dev_id)
+ {
+ memcpy(tagrec_userdata,&rx_buffer[RT_USERDATA_INDEX+2],tagrec_datalen+1);
+ OutputUserData(rec_nearbaseid,tagrec_userdata,tagrec_datalen);
+ }
nearbase_distlist[rec_nearbasepos]=temp_dist;
if(temp_dist!=0x1ffff)
@@ -928,14 +933,17 @@
dwt_writetxdata(22+REMOTEPARA_LEN, tx_nearresp_msg, 0);//写入发送数据
dwt_writetxfctrl(22+REMOTEPARA_LEN, 0);//设定发送长度
}else{
-
+ temp_sendlen = 0;
if(time32_incr-getuserdata_tick<500)
- { memcpy(&tx_nearresp_msg[RT_USERDATA_INDEX],userdata,USERDATA_LEN+1);
+ {
+ temp_sendlen+=7;
+ memcpy(&tx_nearresp_msg[RT_USERDATA_INDEX],userdata,USERDATA_LEN+3);
}else{
- userdata[0] = 0;
+ tx_nearresp_msg[RT_USERDATA_INDEX] = 0;
+
}
- dwt_writetxdata(22+userdata[0]+1, tx_nearresp_msg, 0);//写入发送数据
- dwt_writetxfctrl(22+userdata[0]+1, 0);//设定发送长度
+ dwt_writetxdata(22+temp_sendlen, tx_nearresp_msg, 0);//写入发送数据
+ dwt_writetxfctrl(22+temp_sendlen, 0);//设定发送长度
}
result = dwt_starttx(DWT_START_TX_DELAYED | DWT_RESPONSE_EXPECTED);//延迟发送，等待接收
@@ -1139,10 +1147,11 @@
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];
- tagrec_datalen = rx_buffer[NEARBASENUM_INDEX+rec_nearbase_num*2];
- if(tagrec_datalen==USERDATA_LEN)
+ tagrec_datalen = rx_buffer[NEARBASEID_INDEX+rec_nearbase_num*2+2];
+ memcpy(&rec_userdata_targetid,&rx_buffer[NEARBASEID_INDEX+rec_nearbase_num*2],2);
+ if(tagrec_datalen==USERDATA_LEN&&rec_userdata_targetid==dev_id)
{
- memcpy(tagrec_userdata,&rx_buffer[NEARBASENUM_INDEX+rec_nearbase_num*2],tagrec_datalen+1);
+ memcpy(tagrec_userdata,&rx_buffer[NEARBASEID_INDEX+rec_nearbase_num*2+2],tagrec_datalen+1);
OutputUserData(tag_id_recv,tagrec_userdata,tagrec_datalen);
}
if(rec_nearbase_num>ancidlist_num)
--
Gitblit v1.9.3