From 12b8ab1d9cd575e0975ea1dbcf99ad761aecdf66 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 29 三月 2022 17:49:12 +0800
Subject: [PATCH] V1.69

---
 源码/核心板/Src/application/dw_app.h |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 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 5430be3..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"
@@ -18,16 +18,18 @@
 #include <stdio.h>
 #include "beep.h"
 #include <math.h>
+#include "TrackingDiff.h"
 
-#define USART_INTEGRATE_OUTPUT
-//#define WORK_MODE_TAG
+#define USART_SINGLE_OUTPUT
+//#define USART_INTEGRATE_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
@@ -36,7 +38,7 @@
 #define DFT_RAND_DLY_TIM_MS			1
 #define QUIT_SLOT_TIME    5
 #define KEEP_TIMES 3
-
+#define SLOT_SCALE 0.7
 #define RNG_DELAY_MS 100
 
 /* Default antenna delay values for 64 MHz PRF. See NOTE 1 below. */
@@ -82,6 +84,7 @@
 #define MESSAGE_TYPE_IDX 			9	
 //Poll
 #define ANC_TYPE_IDX 					14
+
 //respose
 #define DIST_IDX 							10
 #define ANCTIMEMS             14
@@ -89,6 +92,7 @@
 #define MAINBASE_INDEX        18
 #define MOTORSTATE_INDEX      19
 #define REMOTEPARA_INDEX      20
+#define RESPONSE_USERDATA_IDX     21
 
 #define TAGSLOTPOS						7
 //Final
@@ -102,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 BATTARY_IDX						1
-#define BUTTON_IDX						2
 #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;
@@ -131,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