From 1f703ab0c4761e3260b68481bf9f8626f08e7c98 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期五, 16 十二月 2022 14:09:12 +0800
Subject: [PATCH] V2.60

---
 Src/application/dw_app.h |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/Src/application/dw_app.h b/Src/application/dw_app.h
index 2aba99e..bc5ddc7 100644
--- a/Src/application/dw_app.h
+++ b/Src/application/dw_app.h
@@ -13,8 +13,12 @@
 
 //#define NEWBOARD
 //#define TAG_OUTPUT
+#define MAX_RFPOWER   67
+#define DEFAULT_RFPOWER   30
+#define REGISTER_FREQUENCY 1
 #define HEX_OUTPUT
-
+#define TOTAL_SLOTNUM 200
+#define SLOTTIME_MS 48
 #define SLOT_SCALE 0.24
 #define MAX_NEARBASE_NUM 12
 #define KEEP_TIMES 3
@@ -29,6 +33,8 @@
 #define MIN_ANCHOR_NUM 2
 #define SYNC_SEQ_IDX    			5
 #define REMOTEPARA_LEN 18
+#define OUTRANGE_RESTARTTIMES 5
+
 
 #define POLL     							0x01
 #define RESPONSE 							0x02
@@ -38,11 +44,26 @@
 #define NEAR_POLL   					0x06
 #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   //
 //General
 #define GROUP_ID_IDX   				0
 #define ANCHOR_ID_IDX    			1
 #define TAG_ID_IDX    				5
 #define MESSAGE_TYPE_IDX 			9	
+
+#define NEARBASENUM_INDEX    18
+#define NEARBASEID_INDEX		 19
 //Poll
 #define TAGSTATE              7
 #define ANC_TYPE_IDX 					14
@@ -50,9 +71,13 @@
 #define DIST_IDX 							10
 #define ANCTIMEMS             14
 #define ANCTIMEUS             16
-#define TAGSLOTPOS						7
+
 #define MOTORSTATE_INDEX      19
-#define REMOTEPARA_INDEX      20
+#define NR_NEARSWITCH_DISTANCE 20
+#define REMOTEPARA_INDEX      22
+#define MAXRANGE_DISTANCE       22
+#define ANC_SIGNALPOWER         24
+
 //Final
 #define TAGCONFIGSUCCESS_INDEX 7
 #define FINAL_MSG_POLL_TX_TS_IDX 10
@@ -63,15 +88,37 @@
 //SYNC
 #define SYNC_SEQ_IDX    			5
 //NEAR MSG
-#define NEARMSG_EMPTYSLOTPOS_INDEX		 1 //RESPONSE
-#define NEARBASENUM_INDEX    10
-#define NEARBASEID_INDEX		 11
+#define ANCMSG_EMPTYSLOTPOS_INDEX		 1 //RESPONSE
 //NEAR POLL
+#define NEARP_TAGFREQ_INDEX  10
+#define NEARP_TAGNEWPOSFLAG_INDEX  11
+#define NEARP_TAGSLOTPOS_INDEX  12
+//POS RESPONSE
+#define PR_TAGPOS_INDEX             7
+//TAG MSG
+#define TAGMSG_CURRENTPOS_IDX 10
+//ANC MSG
+#define ANCMSG_TAGSLOTPOS_IDX		 10 //RESPONSE
+#define ANCMSG_TAGPERIODMS_IDX       12  //100ms整数倍
+//REG POLL
+#define REGP_TAGSTATE_INDEX  10
+#define REGP_VERSION_INDEX  11
+#define REGP_FREQUENCY_INDEX  13
+#define REGP_POWER_INDEX  14
+#define REGP_IMUTHRES_INDEX  15
+#define REGP_NOMOVESLEEPTIME_INDEX  17
+#define REGP_HEIGHTOFFSET_INDEX 19
+//REG RESPONSE
+#define REGR_TAGFREQ_INDEX  10
+#define REGR_TAGSLOTPOS_INDEX  12
+#define REGR_BASENUM_INDEX    18
+#define REGR_BASEID_INDEX		 19
 
 
 #define SEQUENCE_IDX					3
 #define BATTARY_IDX						4
 #define BUTTON_IDX						7
+#define SEQUENCEH_IDX					8
 
 #define DW_CTRL_GPIO					GPIOA
 #define DW_ENABLE   HAL_GPIO_WritePin(DW_CTRL_GPIO, DW_CTRL_Pin, GPIO_PIN_RESET)
@@ -99,4 +146,5 @@
 
 extern void TagDistClear(void);
 void Dw1000_App_Init(void);
+void DelayOneSlot(void);
 #endif

--
Gitblit v1.9.3