From 86e04d444c5c20e72ab73dae89845a8114c3c227 Mon Sep 17 00:00:00 2001
From: xinyang <txy15436@gmail.com>
Date: Thu, 2 May 2019 21:25:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E6=8E=A5?=
 =?UTF-8?q?=E6=94=B6=E7=9A=84BUG=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt |  2 +-
 main.cpp       | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6dcd4f8..3395bc8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
 PROJECT(AutoAim)
 SET(CMAKE_CXX_STANDARD 11)
 SET(CMAKE_BUILD_TYPE RELEASE)
-SET(CMAKE_CXX_FLAGS "-DPROJECT_DIR=\"\\\"${PROJECT_SOURCE_DIR}\\\"\"")
+SET(CMAKE_CXX_FLAGS "-DPATH=\"\\\"${PROJECT_SOURCE_DIR}\\\"\"")
 
 FIND_PROGRAM(CCACHE_FOUND ccache)
 IF(CCACHE_FOUND)
diff --git a/main.cpp b/main.cpp
index cf79f1e..378370e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -18,9 +18,9 @@
 //#define DO_NOT_CNT_TIME
 #include <log.h>
 
-#define PATH PROJECT_DIR
+#define PROJECT_DIR  PATH
 #define ENERGY_STATE 1
-#define ARMOR_STATE 0
+#define ARMOR_STATE  0
 
 using namespace cv;
 using namespace std;
@@ -64,7 +64,7 @@ int main(int argc, char *argv[]){
 
 		Mat energy_src, armor_src;
 
-		ArmorFinder armorFinder(ENEMY_BLUE, uart, PATH"/tools/para/");
+		ArmorFinder armorFinder(ENEMY_BLUE, uart, PROJECT_DIR"/tools/para/");
 
         Energy energy(uart);
         energy.setAllyColor(ally_color);
@@ -102,6 +102,7 @@ int main(int argc, char *argv[]){
 	return 0;
 }
 
+#define RECEIVE_LOG_LEVEL LOG_NOTHING
 
 void uartReceive(Uart* uart){
     char buffer[100];
@@ -111,28 +112,28 @@ void uartReceive(Uart* uart){
         while((data=uart->receive()) != '\n'){
             buffer[cnt++] = data;
             if(cnt >= 100){
-//                LOGE("data receive over flow!");
+                LOG(RECEIVE_LOG_LEVEL, "data receive over flow!");
+                    cnt = 0;
             }
         }
         if(cnt == 10){
             if(buffer[8] == 'e'){
                 state = ENERGY_STATE;
-//                LOGM("Energy state");
+                LOG(RECEIVE_LOG_LEVEL, "Energy state");
             }else if(buffer[8] == 'a'){
                 state = ARMOR_STATE;
-//                LOGM("Armor state");
+                LOG(RECEIVE_LOG_LEVEL, "Armor state");
             }
             memcpy(&curr_yaw, buffer, 4);
             memcpy(&curr_pitch, buffer+4, 4);
-//            LOGM("Get yaw:%f pitch:%f", curr_yaw, curr_pitch);
+            LOG(RECEIVE_LOG_LEVEL, "Get yaw:%f pitch:%f", curr_yaw, curr_pitch);
             if(buffer[9] == 1){
                 if(mark == 0){
                     mark = 1;
                     mark_yaw = curr_yaw;
                     mark_pitch = curr_pitch;
                 }
-
-//                LOGM("Marked");
+                LOG(RECEIVE_LOG_LEVEL, "Marked");
             }
         }
         cnt = 0;