From 42f612027142072eb116f97e41060111d9ea9655 Mon Sep 17 00:00:00 2001
From: xinyang <txy15436@gmail.com>
Date: Sun, 14 Apr 2019 17:47:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=91=BD=E4=BB=A4=E8=A1=8C?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/options/additions.h |  1 -
 main.cpp                    | 14 +++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/include/options/additions.h b/include/options/additions.h
index 03b67c3..13c1550 100644
--- a/include/options/additions.h
+++ b/include/options/additions.h
@@ -9,7 +9,6 @@
 #include <opencv2/core.hpp>
 #include <thread>
 
-std::thread*  create_data_recv_thread(Uart *uart);
 void save_video_file(cv::Mat &src);
 void save_labelled_image(cv::Mat &src, cv::Rect2d box);
 
diff --git a/main.cpp b/main.cpp
index 76ef5cd..2a35638 100644
--- a/main.cpp
+++ b/main.cpp
@@ -15,8 +15,9 @@
 #include "camera/video_wrapper.h"
 #include "camera/wrapper_head.h"
 #include "armor_finder/armor_finder.h"
-
+#include <options/options.h>
 #include <log.h>
+
 #include <time.h>
 #include <thread>
 
@@ -31,8 +32,9 @@ float yaw, pitch;
 
 void uartReceive(Uart* uart);
 
-int main()
+int main(int argc, char *argv[])
 {
+    process_options(argc, argv);
     Uart uart;
 	bool flag = true;
 	short done = 0;//用于检测是否已经读完初始激光中心时的角度
@@ -43,8 +45,10 @@ int main()
         int energy_part_rotation = CLOCKWISE;
 
 	    int from_camera = 1;
-	    cout<<"Input 1 for camera, 0 for video files"<<endl;
-	    cin>>from_camera;
+	    if(!run_with_camera) {
+            cout << "Input 1 for camera, 0 for video files" << endl;
+            cin >> from_camera;
+        }
 
 		WrapperHead *video;
 		if(from_camera)
@@ -86,7 +90,7 @@ int main()
                 armorFinder.run(src_none);
             }
 
-			if (waitKey(10) == 'q') {
+			if (waitKey(1) == 'q') {
 				flag = false;
 				break;
 			}