From dac7616c3350115eee6d9e6edb9085fb6e79428b Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 06 四月 2021 14:24:39 +0800
Subject: [PATCH] V1.44

---
 源码/核心板/Src/application/dw_app.h |    9 +++------
 1 files changed, 3 insertions(+), 6 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..26826fa 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

--
Gitblit v1.9.3