From 8770b97111b845632246b08696f4362f6e88a5ee Mon Sep 17 00:00:00 2001
From: guanjiao <sqrgj@163.com>
Date: 星期六, 15 九月 2018 20:31:25 +0800
Subject: [PATCH] Merge branch 'dev_zyc' into Merge_anchor_and_tag
---
源码/核心板/Src/application/dw_app.c | 46 +++++++++++++++++++++++++++++-----------------
1 files changed, 29 insertions(+), 17 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 64a0756..84ee3d2 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"
@@ -49,13 +49,13 @@
#define POLL_TX_TO_RESP_RX_DLY_UUS 150
/* This is the delay from Frame RX timestamp to TX reply timestamp used for calculating/setting the DW1000's delayed TX function. This includes the
* frame length of approximately 2.66 ms with above configuration. */
-#define RESP_RX_TO_FINAL_TX_DLY_UUS 4100
+#define RESP_RX_TO_FINAL_TX_DLY_UUS 1500
/* Receive response timeout. See NOTE 5 below. */
-#define RESP_RX_TIMEOUT_UUS 14700
+#define RESP_RX_TIMEOUT_UUS 2700
-#define POLL_RX_TO_RESP_TX_DLY_UUS 3600
+#define POLL_RX_TO_RESP_TX_DLY_UUS 420
/* This is the delay from the end of the frame transmission to the enable of the receiver, as programmed for the DW1000's wait for response feature. */
-#define RESP_TX_TO_FINAL_RX_DLY_UUS 500
+#define RESP_TX_TO_FINAL_RX_DLY_UUS 200
/* Receive final timeout. See NOTE 5 below. */
#define FINAL_RX_TIMEOUT_UUS 4300
@@ -78,18 +78,17 @@
/*------------------------------------ Variables ------------------------------------------*/
/* Default communication configuration. We use here EVK1000's default mode (mode 3). */
-static dwt_config_t config =
-{
- 2, /* Channel number. */
- DWT_PRF_64M, /* Pulse repetition frequency. */
- DWT_PLEN_1024, /* Preamble length. */
- DWT_PAC32, /* Preamble acquisition chunk size. Used in RX only. */
- 9, /* TX preamble code. Used in TX only. */
- 9, /* RX preamble code. Used in RX only. */
- 1, /* Use non-standard SFD (Boolean) */
- DWT_BR_110K, /* Data rate. */
- DWT_PHRMODE_STD, /* PHY header mode. */
- (1025 + 64 - 32) /* SFD timeout (preamble length + 1 + SFD length - PAC size). Used in RX only. */
+static dwt_config_t config = {
+ 5, /* Channel number. */
+ DWT_PRF_64M, /* Pulse repetition frequency. */
+ DWT_PLEN_128, /* Preamble length. */
+ DWT_PAC8, /* Preamble acquisition chunk size. Used in RX only. */
+ 9, /* TX preamble code. Used in TX only. */
+ 9, /* RX preamble code. Used in RX only. */
+ 0, /* Use non-standard SFD (Boolean) */
+ DWT_BR_6M8, /* Data rate. */
+ DWT_PHRMODE_STD, /* PHY header mode. */
+ (129 + 8 - 8) /* SFD timeout (preamble length + 1 + SFD length - PAC size). Used in RX only. */
};
/* Frames used in the ranging process. See NOTE 2 below. */
@@ -229,7 +228,9 @@
/* Configure DW1000. See NOTE 6 below. */
dwt_configure(&config);//配置DW1000
+
+
/* Apply default antenna delay value. See NOTE 1 below. */
dwt_setrxantennadelay(RX_ANT_DLY); //设置接收天线延迟
dwt_settxantennadelay(TX_ANT_DLY); //设置发射天线延迟
@@ -240,10 +241,20 @@
dwt_setrxtimeout(RESP_RX_TIMEOUT_UUS); //设置接收超时时间
}
+void tag_sleep_configuraion(void)
+{
+ dwt_configuresleep(0x940, 0x7);
+ dwt_entersleep();
+}
+
void Tag_App(void)//发送模式(TAG标签)
{
uint32_t frame_len;
uint32_t final_tx_time;
+
+ GPIO_ResetBits(SPIx_GPIO, SPIx_CS);
+ delay_us(2000);
+ GPIO_SetBits(SPIx_GPIO, SPIx_CS);
/* Write frame data to DW1000 and prepare transmission. See NOTE 7 below. */
tx_poll_msg[ALL_MSG_SN_IDX] = frame_seq_nb;
@@ -325,7 +336,8 @@
}
LED0_BLINK;
/* Execute a delay between ranging exchanges. */
- deca_sleep(RNG_DELAY_MS + random_delay_tim); //休眠固定时间
+ dwt_entersleep();
+
}
void Anchor_App(void)
--
Gitblit v1.9.3