VSAG/amadeus_26_fb
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-23 22:26:52 +08:00
parent 4a012f0fc4 07b74d6d27
commit b3fc773222
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
armor/src/armor_finder/find/find_armor_box.cpp
View File

@@ -150,7 +150,7 @@ bool ArmorFinder::findArmorBox(const cv::Mat &src, ArmorBox &box) {
char filename[100]; char filename[100];
sprintf(filename, PROJECT_DIR"/armor_box_photo/%s_%d.jpg", id2name[one_box.id].data(), sprintf(filename, PROJECT_DIR"/armor_box_photo/%s_%d.jpg", id2name[one_box.id].data(),
time(nullptr) + clock()); time(nullptr) + clock());
cv::imwrite(filename, src(armor_box.rect)); cv::imwrite(filename, src(one_box.rect));
} }
} }
if (box.rect == cv::Rect2d(0, 0, 0, 0)) { if (box.rect == cv::Rect2d(0, 0, 0, 0)) {

1
tools/create-startup.sh
View File

@@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
echo "#!/bin/bash" > $2/startup-run echo "#!/bin/bash" > $2/startup-run
echo "echo sjturm | sudo -S cpufreq-set -g performance" >> $2/startup-run
echo "$1/tools/auto-pull.sh" >> $2/startup-run echo "$1/tools/auto-pull.sh" >> $2/startup-run
echo "gnome-terminal -- bash -c \"echo sjturm | sudo -S $1/tools/monitor.sh \\\"$2/run --run-with-camera --save-video --wait-uart --save-labelled-boxes\\\"\"" >> $2/startup-run echo "gnome-terminal -- bash -c \"echo sjturm | sudo -S $1/tools/monitor.sh \\\"$2/run --run-with-camera --save-video --wait-uart --save-labelled-boxes\\\"\"" >> $2/startup-run
chmod +x $2/startup-run chmod +x $2/startup-run