diff --git a/energy/src/energy/run.cpp b/energy/src/energy/run.cpp index 20e3169..a379ace 100644 --- a/energy/src/energy/run.cpp +++ b/energy/src/energy/run.cpp @@ -8,7 +8,7 @@ using std::cout; using std::endl; using std::vector; -extern float mark_yaw, mark_pitch; +extern float curr_yaw, curr_pitch, mark_yaw, mark_pitch; extern int mark; int Energy::run(cv::Mat &src){ @@ -31,11 +31,11 @@ int Energy::run(cv::Mat &src){ // imshow("bin",src); - fans_cnt = findFan(src, fans, last_fans_cnt); +// fans_cnt = findFan(src, fans, last_fans_cnt); // cout<<"fans_cnt: "<0)showFanContours("fan",src,fans); -// fans_cnt=0; + fans_cnt=0; armors_cnt = findArmor(src, armors, last_armors_cnt); // cout<<"armors_cnt: "<