Merge remote-tracking branch 'origin/master'

2019-07-25 12:48:26 +08:00
parent 2896fe5086 75939be514
commit 8a5cfd8869
12 changed files with 43 additions and 29 deletions
--- a/armor/src/armor_finder/send_target/send_target.cpp
+++ b/armor/src/armor_finder/send_target/send_target.cpp
@@ -16,7 +16,7 @@ static bool sendTarget(Serial &serial, double x, double y, double z, uint16_t sh
    time_t t = time(nullptr);
    if (last_time != t) {
        last_time = t;
-        cout << "fps:" << fps << ", (" << x << "," << y << "," << z << ")" << endl;
+        cout << "Armor: fps:" << fps << ", (" << x << "," << y << "," << z << ")" << endl;
        fps = 0;
    }
    fps += 1;