From fa5a89bd9f87ef619619194d00cd495d165e1f12 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期六, 27 六月 2020 19:33:44 +0800
Subject: [PATCH] V1.19 测试10对10 200ms防撞。

---
 源码/核心板/Src/application/dw_app.h |   19 +++++++++++++------
 1 files changed, 13 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 114ded4..b574b3d 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,14 +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 10
+#define MAX_NEARBASE_NUM 12
 
 #define REPOET_ANC_NUM 1
 #define REPOET_ANC_NUM_MIN 1
@@ -34,6 +35,7 @@
 #define TAG_NUM_IN_SYS				256
 #define DFT_RAND_DLY_TIM_MS			1
 #define QUIT_SLOT_TIME    5
+#define KEEP_TIMES 3
 
 #define RNG_DELAY_MS 100
 
@@ -54,9 +56,9 @@
 /* Receive response timeout. See NOTE 5 below. */
 #define RESP_RX_TIMEOUT_UUS 2000
 
-#define DELAY_BETWEEN_TWO_FRAME_UUS 240
+#define DELAY_BETWEEN_TWO_FRAME_UUS 400
 
-#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. */
@@ -84,6 +86,8 @@
 #define DIST_IDX 							10
 #define ANCTIMEMS             14
 #define ANCTIMEUS             16
+#define MAINBASE_INDEX        18
+
 #define TAGSLOTPOS						7
 //Final
 #define FINAL_MSG_POLL_TX_TS_IDX 10
@@ -92,8 +96,10 @@
 #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 NEARMSG_EMPTYSLOTPOS_INDEX		 1 //RESPONSE
 #define NEARBASENUM_INDEX    10
 #define NEARBASEID_INDEX		 11
 //NEAR POLL
@@ -114,7 +120,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],flag_syncbase;
 
 void IdleTask(void);
 uint16_t Checksum_u16(uint8_t* pdata, uint32_t len);
@@ -127,5 +133,6 @@
 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);
+u8 GetRandomSlotPos(uint32_t emptyslot);
 #endif

--
Gitblit v1.9.3