From e0c70da5ce5b2504d2ac4cce68376d1ab5cdf208 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 21 五月 2021 17:01:25 +0800
Subject: [PATCH] 标签输出坐标，测试完成

---
 源码/核心板/Src/application/dw_app.h |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 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 86a6d30..1fdb9bc 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"
@@ -57,9 +57,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 250
 
-#define POLL_RX_TO_RESP_TX_DLY_UUS 470
+#define POLL_RX_TO_RESP_TX_DLY_UUS 770
 /* 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 0
 /* Receive final timeout. See NOTE 5 below. */
@@ -76,6 +76,7 @@
 #define NEAR_POLL   					0x06
 #define NEAR_RESPONSE   			0x07
 #define NEAR_FINAL   					0x08
+#define SPOLL     							0x09
 
 #define REG_POLL   						0x10
 #define REG_RESPONSE   				0x11
@@ -92,7 +93,9 @@
 #define ANCTIMEUS             16
 #define MAINBASE_INDEX        18
 #define MOTORSTATE_INDEX      19
-#define REMOTEPARA_INDEX      20
+#define NR_NEARSWITCH_DISTANCE   20
+#define REMOTEPARA_INDEX      22
+#define TAGPOS_INDEX      22
 
 #define TAGSLOTPOS						7
 //Final
@@ -113,6 +116,9 @@
 #define SEQUENCE_IDX					3
 #define BATTARY_IDX						4
 #define BUTTON_IDX						7
+#define SEQUENCEH_IDX					8
+#define NEARP_TAGFREQ_INDEX  10
+#define NEARP_TAGSLOTPOS_INDEX  12
 //REG RESPONSE
 #define REGR_TAGFREQ_INDEX  10
 #define REGR_TAGSLOTPOS_INDEX  12
@@ -133,7 +139,7 @@
 extern uint32_t g_UWB_com_interval;
 extern float dis_after_filter;
 extern LPFilter_Frac* p_Dis_Filter;		//测距用的低通滤波器
-extern u8 usart_send[100],usart_send_anc[100],flag_syncbase,remotesend_state, remotetag_para[30];;
+extern u8 usart_send[150],usart_send_anc[100],flag_syncbase,remotesend_state, remotetag_para[30];;
 
 void IdleTask(void);
 uint16_t Checksum_u16(uint8_t* pdata, uint32_t len);
@@ -141,11 +147,12 @@
 void Tag_App(void);
 void Anchor_App(void);
 void tag_sleep_configuraion(void);
-extern uint16_t g_Tagdist[TAG_NUM_IN_SYS];
+extern int32_t g_Tagdist[TAG_NUM_IN_SYS];
 extern uint8_t g_flag_Taggetdist[256];
 extern void TagDistClear(void);
 void Dw1000_App_Init(void);
 void TagListUpdate(void);
 void SyncPoll(u8 sync_seq);
+u16 CmpTagInList(u16 tagid);
 u8 GetRandomSlotPos(uint32_t emptyslot);
 #endif

--
Gitblit v1.9.3