From ec0d19df2a093c876bda6876f364756443e7bfa5 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 16 九月 2022 10:49:58 +0800
Subject: [PATCH] V1.3

---
 源码/核心板/Src/application/dw_app.h |   12 +++++-------
 1 files changed, 5 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 3097882..1a41485 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,14 +19,11 @@
 #include "beep.h"
 #include <math.h>
 #include "TrackingDiff.h"
-<<<<<<< HEAD
-=======
-//#define USART_INTEGRATE_OUTPUT
->>>>>>> parent of 47d2701 (V1.41  璐熸暟涓嶈緭鍑� 淇敼鍥炲485鏃犳樉绀築UG)
 
-//#define USART_SINGLE_OUTPUT
+#define USART_SINGLE_OUTPUT
 //#define USART_INTEGRATE_OUTPUT
-#define USART_ALL_OUTPUT
+//#define USART_ALL_OUTPUT
+
 
 //#define NEWBOARD
 //#define TAG_OUTPUT
@@ -97,6 +94,7 @@
 #define REMOTEPARA_INDEX      20
 
 #define TAGSLOTPOS						7
+#define TAGRXPOWER_IDX           8
 //Final
 #define FINAL_MSG_POLL_TX_TS_IDX 10
 #define FINAL_MSG_RESP_RX_TS_IDX 14
@@ -137,7 +135,7 @@
 void Tag_App(void);
 void Anchor_App(void);
 void tag_sleep_configuraion(void);
-extern uint16_t g_Tagdist[TAG_NUM_IN_SYS];
+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);

--
Gitblit v1.9.3