energy change

This commit is contained in:
sun
2019-07-17 23:56:45 +08:00
parent 3258c85888
commit c2a92fc755
9 changed files with 64 additions and 37 deletions

View File

@@ -76,12 +76,12 @@ cv::VideoWriter initVideoWriter(const std::string &filename_prefix) {
bool checkReconnect(bool is_camera_0_connect, bool is_camera_1_connect) {
if (!is_camera_0_connect) {
delete video_gimbal;
video_gimbal = new CameraWrapper(0, "armor");
video_gimbal = new CameraWrapper(0/*, "armor"*/);
is_camera_0_connect = video_gimbal->init();
}
if (!is_camera_1_connect) {
delete video_chassis;
video_chassis = new CameraWrapper(1, "energy");
video_chassis = new CameraWrapper(1/*, "energy"*/);
is_camera_1_connect = video_chassis->init();
}
return is_camera_0_connect && is_camera_1_connect;
@@ -90,7 +90,7 @@ bool checkReconnect(bool is_camera_0_connect, bool is_camera_1_connect) {
bool checkReconnect(bool is_camera_connect) {
if (!is_camera_connect) {
delete video_gimbal;
video_gimbal = new CameraWrapper(0, "armor");
video_gimbal = new CameraWrapper(0/*, "armor"*/);
is_camera_connect = video_gimbal->init();
}
return is_camera_connect;