VSAG/vision_sjtu_19
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
sun
2019-07-06 20:16:50 +08:00
parent 07af506821 cec8fe4dad
commit adc11e6d18
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
energy/src/energy/run.cpp
View File

@@ -40,18 +40,19 @@ int Energy::runBig(cv::Mat &gimble_src, cv::Mat &chassis_src){
return 0; return 0;
} }
if(++gimble_cnt==10){ if(++gimble_cnt%8==0){
former_point=circle_center_point; former_point=circle_center_point;
gimble_cnt=0; //gimble_cnt=0;
} }
if(former_point==predict_point&&gimble_cnt==9&&predict_point!=Point(0,0)) { if(former_point==predict_point&&gimble_cnt%8==7&&predict_point!=Point(0,0)) {
centered=true; centered=true;
cout<<"gimble focused!"<<endl; cout<<"gimble focused!"<<endl;
cout<<"number of framse: "<<gimble_cnt<<endl;
} }
predict_point=circle_center_point; predict_point=circle_center_point;
cout<<gimble_cnt<<endl; // cout<<gimble_cnt<<endl;
cout<<"center:("<<predict_point.x<<','<<predict_point.y<<")\n"; // cout<<"center:("<<predict_point.x<<','<<predict_point.y<<")\n";
gimbleRotation(); gimbleRotation();
// cout<<"send"<<endl; // cout<<"send"<<endl;

6
main.cpp
View File

@@ -26,7 +26,7 @@ using namespace std;
mcu_data mcuData = { mcu_data mcuData = {
0, 0,
0, 0,
SMALL_ENERGY_STATE, BIG_ENERGY_STATE,
0, 0,
1, 1,
ENEMY_RED, ENEMY_RED,
@@ -56,8 +56,8 @@ int main(int argc, char *argv[]) {
video_gimble = new CameraWrapper(0/*, "armor"*/); video_gimble = new CameraWrapper(0/*, "armor"*/);
video_chassis = new CameraWrapper(1/*, "energy"*/); video_chassis = new CameraWrapper(1/*, "energy"*/);
} else { } else {
video_gimble = new VideoWrapper("/home/sun/项目/energy_video/energy_test.avi"); video_gimble = new VideoWrapper("/Users/leo/Desktop/videos/179.avi");
video_chassis = new VideoWrapper("/home/sun/项目/energy_video/energy_test.avi"); video_chassis = new VideoWrapper("/Users/leo/Desktop/videos/179.avi");
} }
if (video_gimble->init()) { if (video_gimble->init()) {
LOGM("video_gimble source initialization successfully."); LOGM("video_gimble source initialization successfully.");