From 5f2e06850028e286bd95cfd003dd0682af267be3 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期日, 29 三月 2020 11:29:07 +0800
Subject: [PATCH] 增加组ID模式
---
源码/核心板/Src/application/dw_app.c | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 1268afd..97bb644 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"
@@ -275,6 +275,10 @@
tx_final_msg[MESSAGE_TYPE_IDX]=FINAL;
tx_sync_msg[MESSAGE_TYPE_IDX]=SYNC;
+ memcpy(&tx_poll_msg[GROUP_ID_IDX], &group_id, 1);
+ memcpy(&tx_final_msg[GROUP_ID_IDX], &group_id, 1);
+ memcpy(&tx_resp_msg[GROUP_ID_IDX], &group_id, 1);
+
memcpy(&tx_poll_msg[TAG_ID_IDX], &dev_id, 4);
memcpy(&tx_final_msg[TAG_ID_IDX], &dev_id, 4);
memcpy(&tx_resp_msg[ANCHOR_ID_IDX], &dev_id, 4);
@@ -374,7 +378,7 @@
/* Check that the frame is the expected response from the companion "DS TWR responder" example.
* As the sequence number field of the frame is not relevant, it is cleared to simplify the validation of the frame. */
- if (rx_buffer[MESSAGE_TYPE_IDX] == RESPONSE&&!memcmp(&rx_buffer[TAG_ID_IDX],&dev_id,4)) //判断接收到的数据是否是response数据
+ if (rx_buffer[GROUP_ID_IDX] == group_id&&rx_buffer[MESSAGE_TYPE_IDX] == RESPONSE&&!memcmp(&rx_buffer[TAG_ID_IDX],&dev_id,4)) //判断接收到的数据是否是response数据
{ u16 anc_id_recv;
/* Retrieve poll transmission and response reception timestamp. */
poll_tx_ts = get_tx_timestamp_u64(); //获得POLL发送时间T1
@@ -466,10 +470,10 @@
// deca_sleep(10);
}
// dwt_entersleep();
- if(tag_succ_times<g_com_map[MIN_REPORT_ANC_NUM])
- {
- //poll_timer +=time32_incr&0x7+3;
- }
+// if(tag_succ_times<g_com_map[MIN_REPORT_ANC_NUM])
+// {
+// //poll_timer +=time32_incr&0x7+3;
+// }
/* Execute a delay between ranging exchanges. */
@@ -523,7 +527,7 @@
// tag_recv_interval = tag_recv_timer + 65535 - tag_time_recv[tag_id_recv];
// }
- if (rx_buffer[MESSAGE_TYPE_IDX] == POLL&&(anchor_type == rx_buffer[ANC_TYPE_IDX])) //判断是否是poll包数据
+ if (rx_buffer[GROUP_ID_IDX] == group_id&&rx_buffer[MESSAGE_TYPE_IDX] == POLL&&(anchor_type == rx_buffer[ANC_TYPE_IDX])) //判断是否是poll包数据
{
tmp_time=TIM3->CNT;
memcpy(&tx_resp_msg[ANCTIMEMS],&sync_timer,2);
@@ -577,7 +581,7 @@
/* Check that the frame is a final message sent by "DS TWR initiator" example.
* As the sequence number field of the frame is not used in this example, it can be zeroed to ease the validation of the frame. */
- if (rx_buffer[MESSAGE_TYPE_IDX] == FINAL&&!memcmp(&rx_buffer[TAG_ID_IDX],&tag_id_recv,4)&&!memcmp(&rx_buffer[ANCHOR_ID_IDX],&dev_id,4)) //判断是否为Final包
+ if (rx_buffer[GROUP_ID_IDX] == group_id&&rx_buffer[MESSAGE_TYPE_IDX] == FINAL&&!memcmp(&rx_buffer[TAG_ID_IDX],&tag_id_recv,4)&&!memcmp(&rx_buffer[ANCHOR_ID_IDX],&dev_id,4)) //判断是否为Final包
{
uint32_t poll_tx_ts, resp_rx_ts, final_tx_ts;
uint32_t poll_rx_ts_32, resp_tx_ts_32, final_rx_ts_32;
--
Gitblit v1.9.3