From 015bafa2f40cfbf4ea884e26ebbbf398a5565b5a Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 15 九月 2020 21:49:57 +0800
Subject: [PATCH] 修改标签按键读取参数BUG

---
 Src/application/dw_app.h |   61 +++++++++++++++++++++++++++++-
 1 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/Src/application/dw_app.h b/Src/application/dw_app.h
index 56804b2..c8a911a 100644
--- a/Src/application/dw_app.h
+++ b/Src/application/dw_app.h
@@ -8,12 +8,16 @@
 #include "ADC.h"
 #include "TrackingDiff.h"
 
-//#define WORK_MODE_TAG
-#define WORK_MODE_ANCHOR
+//BITSTATE
+#define GOINGSLEEPBIT 1
 
 //#define NEWBOARD
 //#define TAG_OUTPUT
 #define HEX_OUTPUT
+
+#define SLOT_SCALE 0.7
+#define MAX_NEARBASE_NUM 12
+#define KEEP_TIMES 3
 
 #define REPOET_ANC_NUM 1
 #define REPOET_ANC_NUM_MIN 1
@@ -21,6 +25,57 @@
 #define GROUP_TAG_NUM 2
 #define TAG_NUM_IN_SYS				25
 #define DFT_RAND_DLY_TIM_MS			1
+#define THRESHOLD_CHANGE_MAINBASE_DIST   50
+#define MIN_ANCHOR_NUM 2
+#define SYNC_SEQ_IDX    			5
+#define REMOTEPARA_LEN 18
+
+#define POLL     							0x01
+#define RESPONSE 							0x02
+#define FINAL   							0x03
+#define SYNC   								0x04
+#define NEAR_MSG   						0x05
+#define NEAR_POLL   					0x06
+#define NEAR_RESPONSE   			0x07
+#define NEAR_FINAL   					0x08
+//General
+#define GROUP_ID_IDX   				0
+#define ANCHOR_ID_IDX    			1
+#define TAG_ID_IDX    				5
+#define MESSAGE_TYPE_IDX 			9	
+//Poll
+#define TAGSTATE              7
+#define ANC_TYPE_IDX 					14
+//respose
+#define DIST_IDX 							10
+#define ANCTIMEMS             14
+#define ANCTIMEUS             16
+#define TAGSLOTPOS						7
+#define MOTORSTATE_INDEX      19
+#define REMOTEPARA_INDEX      20
+//Final
+#define TAGCONFIGSUCCESS_INDEX 7
+#define FINAL_MSG_POLL_TX_TS_IDX 10
+#define FINAL_MSG_RESP_RX_TS_IDX 14
+#define FINAL_MSG_FINAL_TX_TS_IDX 18
+#define FINAL_MSG_RESP_RX_NEARBASE_IDX  22
+#define FINAL_MSG_TS_LEN 4
+//SYNC
+#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 DW_CTRL_GPIO					GPIOA
+#define DW_ENABLE   HAL_GPIO_WritePin(DW_CTRL_GPIO, DW_CTRL_Pin, GPIO_PIN_RESET)
+#define DW_DISABLE  HAL_GPIO_WritePin(DW_CTRL_GPIO, DW_CTRL_Pin, GPIO_PIN_SET)
 extern TrackingDiffClass *pUWBDistanceTrackingDiff;
 extern uint16_t poll_timer,tag_timer;
 extern int8_t tag_delaytime;
@@ -41,7 +96,7 @@
 void Anchor_App(void);
 void tag_sleep_configuraion(void);
 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);
 #endif

--
Gitblit v1.9.3