From 1b83e716601b4c7ba981a00be6ecf24a9d549d52 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 20 一月 2021 10:18:56 +0800
Subject: [PATCH] V2.20 1.增加静止时间判定参数，测距有BUG抖动较大

---
 Src/application/dw_app.h |   35 ++++++++++++++++++++++++++++++-----
 1 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/Src/application/dw_app.h b/Src/application/dw_app.h
index 2673289..19e4cbd 100644
--- a/Src/application/dw_app.h
+++ b/Src/application/dw_app.h
@@ -13,9 +13,13 @@
 
 //#define NEWBOARD
 //#define TAG_OUTPUT
+#define MAX_RFPOWER   60
+#define DEFAULT_RFPOWER   30
+#define REGISTER_FREQUENCY 1
 #define HEX_OUTPUT
-
-#define SLOT_SCALE 0.5
+#define TOTAL_SLOTNUM 200
+#define SLOTTIME_MS 48
+#define SLOT_SCALE 0.24
 #define MAX_NEARBASE_NUM 12
 #define KEEP_TIMES 3
 
@@ -38,11 +42,17 @@
 #define NEAR_POLL   					0x06
 #define NEAR_RESPONSE   			0x07
 #define NEAR_FINAL   					0x08
+
+#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
@@ -52,7 +62,8 @@
 #define ANCTIMEUS             16
 #define TAGSLOTPOS						7
 #define MOTORSTATE_INDEX      19
-#define REMOTEPARA_INDEX      20
+#define NR_NEARSWITCH_DISTANCE 20
+#define REMOTEPARA_INDEX      22
 //Final
 #define TAGCONFIGSUCCESS_INDEX 7
 #define FINAL_MSG_POLL_TX_TS_IDX 10
@@ -64,9 +75,23 @@
 #define SYNC_SEQ_IDX    			5
 //NEAR MSG
 #define NEARMSG_EMPTYSLOTPOS_INDEX		 1 //RESPONSE
-#define NEARBASENUM_INDEX    10
-#define NEARBASEID_INDEX		 11
 //NEAR POLL
+#define NEARP_TAGFREQ_INDEX  10
+#define NEARP_TAGSLOTPOS_INDEX  12
+
+
+//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
+//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

--
Gitblit v1.9.3