energy changed

This commit is contained in:
sun
2019-08-08 23:00:06 +08:00
parent faae07b5b3
commit bb2a088d38
7 changed files with 31 additions and 22 deletions

View File

@@ -30,10 +30,10 @@ using namespace std;
McuData mcu_data = { // 单片机端回传结构体
0, // 当前云台yaw角
0, // 当前云台pitch角
ARMOR_STATE, // 当前状态,自瞄-大符-小符
BIG_ENERGY_STATE, // 当前状态,自瞄-大符-小符
0, // 云台角度标记位
1, // 是否启用数字识别
ENEMY_RED, // 敌方颜色
ENEMY_BLUE, // 敌方颜色
0, // 能量机关x轴补偿量
0, // 能量机关y轴补偿量
};
@@ -66,8 +66,8 @@ int main(int argc, char *argv[]) {
video_gimbal = new CameraWrapper(ARMOR_CAMERA_EXPOSURE, ARMOR_CAMERA_GAIN, 2/*, "armor"*/);
video_chassis = new CameraWrapper(ENERGY_CAMERA_EXPOSURE, ENERGY_CAMERA_GAIN, 2/*, "energy"*/);
} else {
video_gimbal = new VideoWrapper(PROJECT_DIR"/8-7-NO7.avi");
video_chassis = new VideoWrapper(PROJECT_DIR"/8-7-NO7.avi");
video_gimbal = new VideoWrapper(PROJECT_DIR"/test_video/red_small.avi");
video_chassis = new VideoWrapper(PROJECT_DIR"/test_video/blue_small.avi");
}
if (video_gimbal->init()) {
LOGM("video_gimbal source initialization successfully.");
@@ -182,7 +182,7 @@ int main(int argc, char *argv[]) {
armor_finder.run(gimbal_src);
});
}
// cv::waitKey(0);
cv::waitKey(0);
});
} while (ok);
delete video_gimbal;