From 2d82c2dfc1a64b05cf92a1bf1bd6fc840cb84e79 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 18 十月 2018 16:24:29 +0800
Subject: [PATCH] Revert "配对完成，有bug"
---
源码/核心板/Src/application/dw_app.c | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 9aa3f99..b28421b 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"
@@ -264,7 +264,7 @@
}
void Dw1000_App_Init(void)
{
- g_com_map[DEV_ID] = 0x04;
+// g_com_map[DEV_ID] = 0x02;
tx_poll_msg[MESSAGE_TYPE_IDX]=POLL;
tx_resp_msg[MESSAGE_TYPE_IDX]=RESPONSE;
tx_final_msg[MESSAGE_TYPE_IDX]=FINAL;
@@ -278,12 +278,15 @@
dwt_configuresleep(0x940, 0x7);
dwt_entersleep();
}
+uint16_t g_Resttimer;
uint8_t result;
void Tag_App(void)//发送模式(TAG标签)
{
uint32_t frame_len;
uint32_t final_tx_time;
+ g_Resttimer=0;
+ UART_CheckReceive();
GPIO_ResetBits(SPIx_GPIO, SPIx_CS);
delay_us(2500);
GPIO_SetBits(SPIx_GPIO, SPIx_CS);
@@ -373,7 +376,7 @@
dwt_entersleep();
}
-uint16_t g_Resttimer;
+extern uint8_t g_pairstart;
void Anchor_App(void)
{
uint32_t frame_len;
@@ -389,7 +392,6 @@
while (!((status_reg = dwt_read32bitreg(SYS_STATUS_ID)) & (SYS_STATUS_RXFCG | SYS_STATUS_ALL_RX_ERR)))//不断查询芯片状态直到接收成功或者出现错误
{
UART_CheckReceive();
- UART_CheckSend();
g_Resttimer=0;
};
@@ -413,7 +415,7 @@
tx_resp_msg[TAG_ID_IDX] = tag_id_recv;
- if (rx_buffer[MESSAGE_TYPE_IDX] == POLL) //判断是否是poll包数据
+ if (rx_buffer[MESSAGE_TYPE_IDX] == POLL&&tag_id_recv!= g_com_map[PAIR_ID]) //判断是否是poll包数据
{
/* Retrieve poll reception timestamp. */
poll_rx_ts = get_rx_timestamp_u64();//获得Poll包接收时间T2
@@ -495,6 +497,13 @@
g_UWB_com_interval = 0;
dis_after_filter=dist_cm;
g_Tagdist[tag_id_recv]=dist_cm;
+ if(g_pairstart==1&&dist_cm<20)
+ {
+ g_pairstart=0;
+ g_com_map[PAIR_ID]=tag_id_recv;
+ save_com_map_to_flash();
+ printf("Pair Finish PairID: %d. \r\n",g_com_map[PAIR_ID]);
+ }
g_flag_Taggetdist[tag_id_recv]=0;
printf("Anchor ID: %d, Tag ID: %d, Dist = %d cm\n", g_com_map[DEV_ID], tag_id_recv, (uint16_t)dis_after_filter);
//dis_after_filter = LP_Frac_Update(p_Dis_Filter, dist_cm);
--
Gitblit v1.9.3