From 170e557c0d38e66e6100d32a2a465ee1cd6f5275 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 07 十月 2020 18:17:34 +0800
Subject: [PATCH] 配临近初步测试完成

---
 源码/核心板/Src/application/dw_app.h |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 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..27ab690 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,9 +19,9 @@
 #include "beep.h"
 #include <math.h>
 
-#define USART_INTEGRATE_OUTPUT
-//#define WORK_MODE_TAG
-
+//#define USART_INTEGRATE_OUTPUT
+//#define TAG_OUTPUT
+//#define DEBUG_INF
 //#define NEWBOARD
 //#define TAG_OUTPUT
 #define HEX_OUTPUT
@@ -36,7 +36,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. */
@@ -92,6 +92,7 @@
 
 #define TAGSLOTPOS						7
 //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
@@ -105,12 +106,12 @@
 #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 REMOTEPARA_LEN 18
-#define THRESHOLD_CHANGE_MAINBASE_DIST   5
+#define THRESHOLD_CHANGE_MAINBASE_DIST   500
 extern u8 neartimout_timer;
 extern u16 slottime,tyncpoll_time,max_slotpos;
 extern u16 poll_timer,tag_timer;

--
Gitblit v1.9.3