diff --git a/energy/src/energy/run.cpp b/energy/src/energy/run.cpp index 9f414a2..8f057ee 100644 --- a/energy/src/energy/run.cpp +++ b/energy/src/energy/run.cpp @@ -79,11 +79,20 @@ void Energy::runBig(cv::Mat &gimbal_src) { if (findArmors(gimbal_src) < 1)return; if (show_energy)showArmors("armor", gimbal_src); if (!findFlowStripFan(gimbal_src)) { - if (!findFlowStripWeak(gimbal_src))return; + if (!findFlowStripWeak(gimbal_src)){ + is_find_target = false; + return; + } } else { if (show_energy)showFlowStripFan("strip fan", gimbal_src); - if (!findTargetInFlowStripFan()) return; - if (!findFlowStrip(gimbal_src))return; + if (!findTargetInFlowStripFan()) { + is_find_target = false; + return; + } + if (!findFlowStrip(gimbal_src)){ + is_find_target = false; + return; + } } is_find_target = true; if (!findCenterROI(gimbal_src))return; diff --git a/main.cpp b/main.cpp index 2c79d05..e3c1167 100644 --- a/main.cpp +++ b/main.cpp @@ -123,8 +123,8 @@ int main(int argc, char *argv[]) { if (!from_camera) extract(gimbal_src, chassis_src); if (save_video) saveVideos(gimbal_src, chassis_src);//保存视频 if (show_origin) showOrigin(gimbal_src, chassis_src);//显示原始图像 -// energy.runBig(gimbal_src, chassis_src); - energy.runBig(gimbal_src); + energy.runBig(gimbal_src, chassis_src); +// energy.runBig(gimbal_src); } else if (curr_state == SMALL_ENERGY_STATE) { if (last_state != SMALL_ENERGY_STATE) { LOGM(STR_CTR(WORD_GREEN, "Start Small Energy!"));