From 012f7bf4e14a8e92f5bba7a2c80b78cbe42fb362 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 23 三月 2021 12:17:37 +0800
Subject: [PATCH] V1.42 增加全基站数据模式，配合新华智云测试

---
 源码/核心板/Src/application/dw_app.h |   10 ++++++----
 1 files changed, 6 insertions(+), 4 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 8809815..c703ac1 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,9 +18,11 @@
 #include <stdio.h>
 #include "beep.h"
 #include <math.h>
+#include "TrackingDiff.h"
 
+//#define USART_SINGLE_OUTPUT
 //#define USART_INTEGRATE_OUTPUT
-
+#define USART_ALL_OUTPUT
 
 //#define NEWBOARD
 //#define TAG_OUTPUT
@@ -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. */
@@ -105,9 +107,9 @@
 #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

--
Gitblit v1.9.3