From 42943ff1e6901a7e58a629ce75cd1d083a31d7d5 Mon Sep 17 00:00:00 2001 From: xinyang <895639507@qq.com> Date: Wed, 14 Aug 2019 12:55:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- others/include/additions.h | 5 +---- others/include/camera/camera_wrapper.h | 8 +++----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/others/include/additions.h b/others/include/additions.h index 8df9e15..0b551fe 100644 --- a/others/include/additions.h +++ b/others/include/additions.h @@ -25,8 +25,6 @@ extern McuData mcu_data; void uartReceive(Serial *pSerial); -bool checkReconnect(bool is_camera_0_connect, bool is_camera_1_connect); - bool checkReconnect(bool is_camera_connect); void saveVideos(const cv::Mat &src); @@ -35,10 +33,9 @@ void showOrigin(const cv::Mat &src); void extract(cv::Mat &src); -double getTimeIntervalms(const systime &now, const systime &last); - double getPointLength(const cv::Point2f &p); +// 循环队列 template class RoundQueue { private: diff --git a/others/include/camera/camera_wrapper.h b/others/include/camera/camera_wrapper.h index 7422fbb..2236d55 100644 --- a/others/include/camera/camera_wrapper.h +++ b/others/include/camera/camera_wrapper.h @@ -1,11 +1,9 @@ // // Created by zhikun on 18-11-7. -// used for testing double cameras -// camera0 is left camera, camera1 is right camera. // -#ifndef VIDEO_TEST1_CAMERA_WRAPPER_H -#define VIDEO_TEST1_CAMERA_WRAPPER_H +#ifndef _CAMERA_WRAPPER_H_ +#define _CAMERA_WRAPPER_H_ #include #include @@ -54,4 +52,4 @@ public: }; -#endif //VIDEO_TEST1_CAMERA_WRAPPER_H +#endif /* _CAMERA_WRAPPER_H_ */