From 4a99709fbaf35e70ab7102c902e2c4caab74b96c Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 18 十月 2018 16:27:33 +0800
Subject: [PATCH] Revert "Revert "配对完成，有bug""
---
源码/核心板/Src/application/dw_app.c | 44 +++++++++++++++++++++++++++++++-------------
1 files changed, 31 insertions(+), 13 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 731f7e8..81f831a 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"
@@ -30,7 +30,8 @@
#include "Usart.h"
#include "global_param.h"
#include "filters.h"
-
+#include <stdio.h>
+#include "beep.h"
/*------------------------------------ Marcos ------------------------------------------*/
@@ -263,7 +264,7 @@
}
void Dw1000_App_Init(void)
{
- g_com_map[DEV_ID]=0x03;
+// 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;
@@ -277,14 +278,17 @@
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(2000);
+ delay_us(2500);
GPIO_SetBits(SPIx_GPIO, SPIx_CS);
/* Write frame data to DW1000 and prepare transmission. See NOTE 7 below. */
@@ -341,12 +345,14 @@
tx_final_msg[ALL_MSG_SN_IDX] = frame_seq_nb;
dwt_writetxdata(sizeof(tx_final_msg), tx_final_msg, 0);//将发送数据写入DW1000
dwt_writetxfctrl(sizeof(tx_final_msg), 0);//设定发送数据长度
- dwt_starttx(DWT_START_TX_DELAYED);//设定为延迟发送
+ result=dwt_starttx(DWT_START_TX_DELAYED);//设定为延迟发送
+
/* Poll DW1000 until TX frame sent event set. See NOTE 8 below. */
- while (!(dwt_read32bitreg(SYS_STATUS_ID) & SYS_STATUS_TXFRS))//不断查询芯片状态直到发送完成
+ if(result==0)
+ {while (!(dwt_read32bitreg(SYS_STATUS_ID) & SYS_STATUS_TXFRS))//不断查询芯片状态直到发送完成
{ };
-
+ }
/* Clear TXFRS event. */
dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_TXFRS);//清除标志位
@@ -370,7 +376,7 @@
dwt_entersleep();
}
-
+extern uint8_t g_pairstart;
void Anchor_App(void)
{
uint32_t frame_len;
@@ -386,7 +392,7 @@
while (!((status_reg = dwt_read32bitreg(SYS_STATUS_ID)) & (SYS_STATUS_RXFCG | SYS_STATUS_ALL_RX_ERR)))//不断查询芯片状态直到接收成功或者出现错误
{
UART_CheckReceive();
- UART_CheckSend();
+ g_Resttimer=0;
};
if (status_reg & SYS_STATUS_RXFCG)//成功接收
@@ -409,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
@@ -427,13 +433,15 @@
tx_resp_msg[ALL_MSG_SN_IDX] = frame_seq_nb;
dwt_writetxdata(sizeof(tx_resp_msg), tx_resp_msg, 0);//写入发送数据
dwt_writetxfctrl(sizeof(tx_resp_msg), 0);//设定发送长度
- dwt_starttx(DWT_START_TX_DELAYED | DWT_RESPONSE_EXPECTED);//延迟发送，等待接收
+ result = dwt_starttx(DWT_START_TX_DELAYED | DWT_RESPONSE_EXPECTED);//延迟发送，等待接收
/* We assume that the transmission is achieved correctly, now poll for reception of expected "final" frame or error/timeout.
* See NOTE 7 below. */
- while (!((status_reg = dwt_read32bitreg(SYS_STATUS_ID)) & (SYS_STATUS_RXFCG | SYS_STATUS_ALL_RX_ERR)))///不断查询芯片状态直到接收成功或者出现错误
+ if(result==0)
+ {
+ while (!((status_reg = dwt_read32bitreg(SYS_STATUS_ID)) & (SYS_STATUS_RXFCG | SYS_STATUS_ALL_RX_ERR)))///不断查询芯片状态直到接收成功或者出现错误
{ };
-
+ }
/* Increment frame sequence number after transmission of the response message (modulo 256). */
frame_seq_nb++;
@@ -489,7 +497,17 @@
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();
+ BEEP2_ON;
+ delay_ms(1000);
+ 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