From 30473596c542f4e475b6654bedf63a4cd4e44214 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期三, 29 十一月 2023 16:12:56 +0800
Subject: [PATCH] Merge branch '定位-临近' of http://47.108.70.204:60062/r/XRange_Tag into 定位-临近

---
 Src/application/dw_app.h |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Src/application/dw_app.h b/Src/application/dw_app.h
index f832c58..69ab0f3 100644
--- a/Src/application/dw_app.h
+++ b/Src/application/dw_app.h
@@ -19,7 +19,7 @@
 #define HEX_OUTPUT
 #define TOTAL_SLOTNUM 200
 #define SLOTTIME_MS 48
-#define SLOT_SCALE 0.24
+#define SLOT_SCALE 0.55
 #define MAX_NEARBASE_NUM 12
 #define KEEP_TIMES 3
 
@@ -45,6 +45,14 @@
 #define NEAR_RESPONSE   			0x07
 #define NEAR_FINAL   					0x08
 #define SPOLL     							0x09
+#define DISCOVERPOLL     				    0x0A
+#define DISCOVERRESPONSE     				    0x0B
+#define DISCOVERFINAL     				    0x0C
+
+#define POS_MSG   						0x15
+#define POS_POLL   					    0x16
+#define POS_RESPONSE   			        0x17
+#define POS_FINAL   					0x18
 
 #define REG_POLL   						0x10   //
 #define REG_RESPONSE   				0x11   //
@@ -52,7 +60,7 @@
 #define GROUP_ID_IDX   				0
 #define ANCHOR_ID_IDX    			1
 #define TAG_ID_IDX    				5
-#define MESSAGE_TYPE_IDX 			9	
+#define MESSAGE_TYPE_IDX 			9
 
 #define NEARBASENUM_INDEX    18
 #define NEARBASEID_INDEX		 19
@@ -120,7 +128,7 @@
 extern uint32_t g_UWB_com_interval;
 extern float dis_after_filter;
 
-extern uint8_t usart_send[25];
+extern uint8_t usart_send[125];
 
 void IdleTask(void);
 uint16_t Checksum_u16(uint8_t* pdata, uint32_t len);
@@ -132,4 +140,5 @@
 
 extern void TagDistClear(void);
 void Dw1000_App_Init(void);
+void DelayOneSlot(void);
 #endif

--
Gitblit v1.9.3