From 1cfdce04c6fc1f67e3b5538b0bc90e0c77a71765 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 10 十一月 2021 10:30:18 +0800
Subject: [PATCH] 未完成

---
 源码/核心板/Src/application/dw_app.h |   12 +++---------
 1 files changed, 3 insertions(+), 9 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..93858de 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,21 +19,15 @@
 #include "beep.h"
 #include <math.h>
 #include "TrackingDiff.h"
-<<<<<<< HEAD
-=======
-//#define USART_INTEGRATE_OUTPUT
->>>>>>> parent of 47d2701 (V1.41  璐熸暟涓嶈緭鍑� 淇敼鍥炲485鏃犳樉绀築UG)
+#define USART_INTEGRATE_OUTPUT
 
-//#define USART_SINGLE_OUTPUT
-//#define USART_INTEGRATE_OUTPUT
-#define USART_ALL_OUTPUT
 
 //#define NEWBOARD
 //#define TAG_OUTPUT
 #define HEX_OUTPUT
 
 #define MAX_NEARBASE_NUM 12
-
+#define USERDATA_LEN 4
 #define REPOET_ANC_NUM 1
 #define REPOET_ANC_NUM_MIN 1
 #define TAG_ID_START 		0// 0x00980000
@@ -95,7 +89,7 @@
 #define MAINBASE_INDEX        18
 #define MOTORSTATE_INDEX      19
 #define REMOTEPARA_INDEX      20
-
+#define RT_USERDATA_INDEX     20
 #define TAGSLOTPOS						7
 //Final
 #define FINAL_MSG_POLL_TX_TS_IDX 10

--
Gitblit v1.9.3