From 7d3477c256ef93ce3190c1d7740c90ee941311cd Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 07 四月 2022 21:00:49 +0800
Subject: [PATCH] V1.70

---
 源码/核心板/Src/application/dw_app.h |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 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 3097882..ac58785 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"
@@ -19,21 +19,17 @@
 #include "beep.h"
 #include <math.h>
 #include "TrackingDiff.h"
-<<<<<<< HEAD
-=======
-//#define USART_INTEGRATE_OUTPUT
->>>>>>> parent of 47d2701 (V1.41  璐熸暟涓嶈緭鍑� 淇敼鍥炲485鏃犳樉绀築UG)
 
-//#define USART_SINGLE_OUTPUT
+#define USART_SINGLE_OUTPUT
 //#define USART_INTEGRATE_OUTPUT
-#define USART_ALL_OUTPUT
+//#define USART_ALL_OUTPUT
+
 
 //#define NEWBOARD
 //#define TAG_OUTPUT
 #define HEX_OUTPUT
 
 #define MAX_NEARBASE_NUM 12
-
 #define REPOET_ANC_NUM 1
 #define REPOET_ANC_NUM_MIN 1
 #define TAG_ID_START 		0// 0x00980000
@@ -88,6 +84,7 @@
 #define MESSAGE_TYPE_IDX 			9	
 //Poll
 #define ANC_TYPE_IDX 					14
+
 //respose
 #define DIST_IDX 							10
 #define ANCTIMEMS             14
@@ -95,6 +92,7 @@
 #define MAINBASE_INDEX        18
 #define MOTORSTATE_INDEX      19
 #define REMOTEPARA_INDEX      20
+#define RESPONSE_USERDATA_IDX     21
 
 #define TAGSLOTPOS						7
 //Final
@@ -108,14 +106,18 @@
 #define SYNC_SEQ_IDX    			5
 //NEAR MSG
 #define NEARMSG_EMPTYSLOTPOS_INDEX		 1 //RESPONSE
-#define NEARBASENUM_INDEX    10
-#define NEARBASEID_INDEX		 11
 //NEAR POLL
 #define SEQUENCE_IDX					3
 #define BATTARY_IDX						4
 #define BUTTON_IDX						7
+#define KUIXIANLEN_INDEX		        10
+#define POLL_USERDATA_IDX               12
+#define NEARBASENUM_INDEX               23
+#define NEARBASEID_INDEX		        24
 
+//Near Response
 #define REMOTEPARA_LEN 18
+
 #define THRESHOLD_CHANGE_MAINBASE_DIST   5
 extern u8 neartimout_timer;
 extern u16 slottime,tyncpoll_time,max_slotpos;
@@ -137,11 +139,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,uint32_t sync_baseid);
 u8 GetRandomSlotPos(uint32_t emptyslot);
+extern u8 uwbrec_userdatalen,uwbrec_userdata[USERDATA_MAXLEN];
 #endif

--
Gitblit v1.9.3