Merge remote-tracking branch 'origin/master'

armor/src/armor_finder/find/find_armor_box.cpp

@@ -150,7 +150,7 @@ bool ArmorFinder::findArmorBox(const cv::Mat &src, ArmorBox &box) {
                 char filename[100];
                 sprintf(filename, PROJECT_DIR"/armor_box_photo/%s_%d.jpg", id2name[one_box.id].data(),
                         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)) {

tools/create-startup.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 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 "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