From 829eef8555abe71bc3eb5b090d690fbe53763ad7 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 08 五月 2020 21:32:29 +0800
Subject: [PATCH] 基本测试完成V1.14

---
 源码/核心板/Src/application/dw_app.h |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.h" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.h"
index 2f460f2..8019c4c 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.h"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.h"
@@ -18,12 +18,15 @@
 #include <stdio.h>
 #include "beep.h"
 #include <math.h>
+
+#define USART_INTEGRATE_OUTPUT
 //#define WORK_MODE_TAG
-#define WORK_MODE_ANCHOR
 
 //#define NEWBOARD
 //#define TAG_OUTPUT
 #define HEX_OUTPUT
+
+#define MAX_NEARBASE_NUM 12
 
 #define REPOET_ANC_NUM 1
 #define REPOET_ANC_NUM_MIN 1
@@ -50,11 +53,11 @@
  * frame length of approximately 2.66 ms with above configuration. */
 #define RESP_RX_TO_FINAL_TX_DLY_UUS 410
 /* Receive response timeout. See NOTE 5 below. */
-#define RESP_RX_TIMEOUT_UUS 600
+#define RESP_RX_TIMEOUT_UUS 2000
 
 #define DELAY_BETWEEN_TWO_FRAME_UUS 240
 
-#define POLL_RX_TO_RESP_TX_DLY_UUS 420
+#define POLL_RX_TO_RESP_TX_DLY_UUS 470
 /* 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 200
 /* Receive final timeout. See NOTE 5 below. */
@@ -90,6 +93,7 @@
 #define FINAL_MSG_RESP_RX_NEARBASE_IDX  22
 #define FINAL_MSG_TS_LEN 4
 //SYNC
+#define ANCHOR_ID_IDX    			1
 #define SYNC_SEQ_IDX    			5
 //NEAR MSG
 #define NEARBASENUM_INDEX    10
@@ -99,7 +103,7 @@
 #define BUTTON_IDX						2
 #define SEQUENCE_IDX					3
 
-#define THRESHOLD_CHANGE_MAINBASE_DIST   50
+#define THRESHOLD_CHANGE_MAINBASE_DIST   5
 extern u8 neartimout_timer;
 extern u16 slottime,tyncpoll_time,max_slotpos;
 extern u16 poll_timer,tag_timer;
@@ -112,7 +116,7 @@
 extern uint32_t g_UWB_com_interval;
 extern float dis_after_filter;
 extern LPFilter_Frac* p_Dis_Filter;		//测距用的低通滤波器
-extern u8 usart_send[25];
+extern u8 usart_send[100],usart_send_anc[100];
 
 void IdleTask(void);
 uint16_t Checksum_u16(uint8_t* pdata, uint32_t len);
@@ -125,5 +129,5 @@
 extern void TagDistClear(void);
 void Dw1000_App_Init(void);
 void TagListUpdate(void);
-void SyncPoll(u8 sync_seq);
+void SyncPoll(u8 sync_seq,uint32_t sync_baseid);
 #endif

--
Gitblit v1.9.3