From aff8d1a0d8547e1049cf68d8c333db7b8ce51364 Mon Sep 17 00:00:00 2001
From: sun <SJT_sjtu1998@163.con>
Date: Thu, 18 Jul 2019 13:07:31 +0800
Subject: [PATCH] energy change

---
 CMakeLists.txt                    | 2 +-
 energy/src/energy/clear/clear.cpp | 4 ++--
 main.cpp                          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8325866..e19eb1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 PROJECT(SJTU-RM-CV)
 SET(CMAKE_CXX_STANDARD 11)
-SET(CMAKE_BUILD_TYPE DEBUG)
+SET(CMAKE_BUILD_TYPE RELEASE)
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DPATH=\"\\\"${PROJECT_SOURCE_DIR}\\\"\"")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D${CMAKE_SYSTEM_NAME}")
diff --git a/energy/src/energy/clear/clear.cpp b/energy/src/energy/clear/clear.cpp
index 5aefa1b..b323af1 100644
--- a/energy/src/energy/clear/clear.cpp
+++ b/energy/src/energy/clear/clear.cpp
@@ -23,8 +23,8 @@ void Energy::clearAll(){
 // 此函数用于图像预处理
 // ---------------------------------------------------------------------------------------------------------------------
 void Energy::initImage(cv::Mat &src){
-//    imagePreprocess(src);
-//    if(show_process)imshow("img_preprocess", src);
+    imagePreprocess(src);
+    if(show_process)imshow("img_preprocess", src);
     if (src.type() == CV_8UC3)cvtColor(src, src, COLOR_BGR2GRAY);
     threshold(src, src, energy_part_param_.GRAY_THRESH, 255, THRESH_BINARY);
     if (show_process)imshow("bin", src);
diff --git a/main.cpp b/main.cpp
index c5f4e0a..ca68173 100644
--- a/main.cpp
+++ b/main.cpp
@@ -30,7 +30,7 @@ using namespace std;
 mcu_data mcuData = {    // 单片机端回传结构体
         0,              // 当前云台yaw角
         0,              // 当前云台pitch角
-        ARMOR_STATE,    // 当前状态，自瞄-大符-小符
+        BIG_ENERGY_STATE,    // 当前状态，自瞄-大符-小符
         0,              // 云台角度标记位
         1,              // 是否启用数字识别
         ENEMY_RED,      // 敌方颜色