From df3db0b978b1cab3555d6878a274b0f382bf707c Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 01 十月 2018 15:42:49 +0800
Subject: [PATCH] 标签开机死机bug改好，基站增加软件超时复位
---
源码/核心板/Src/application/dw_app.c | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 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..2499fa3 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"
@@ -277,14 +277,14 @@
dwt_configuresleep(0x940, 0x7);
dwt_entersleep();
}
-
+uint8_t result;
void Tag_App(void)//发送模式(TAG标签)
{
uint32_t frame_len;
uint32_t final_tx_time;
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 +341,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 +372,7 @@
dwt_entersleep();
}
-
+uint16_t g_Resttimer;
void Anchor_App(void)
{
uint32_t frame_len;
@@ -387,6 +389,7 @@
{
UART_CheckReceive();
UART_CheckSend();
+ g_Resttimer=0;
};
if (status_reg & SYS_STATUS_RXFCG)//成功接收
@@ -427,13 +430,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++;
--
Gitblit v1.9.3