Merge pull request #634 from Dronecode/fix-landed-detection

Cherry-picked #571 onto develop
mavlink · Jan 9, 2019 · c2eefe8 · c2eefe8
2 parents 3672877 + a5d1e16
commit c2eefe8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/example/offboard_velocity/offboard_velocity.cpp b/example/offboard_velocity/offboard_velocity.cpp
@@ -237,9 +237,16 @@ int main(int argc, char **argv)
     const Action::Result land_result = action->land();
     action_error_exit(land_result, "Landing failed");
 
+    // Check if vehicle is still in air
+    while (telemetry->in_air()) {
+        std::cout << "Vehicle is landing..." << std::endl;
+        sleep_for(seconds(1));
+    }
+    std::cout << "Landed!" << std::endl;
+
     // We are relying on auto-disarming but let's keep watching the telemetry for a bit longer.
-    sleep_for(seconds(10));
-    std::cout << "Landed" << std::endl;
+    sleep_for(seconds(3));
+    std::cout << "Finished..." << std::endl;
 
     return EXIT_SUCCESS;
 }
diff --git a/example/takeoff_land/takeoff_and_land.cpp b/example/takeoff_land/takeoff_and_land.cpp
@@ -139,8 +139,16 @@ int main(int argc, char **argv)
         return 1;
     }
 
+    // Check if vehicle is still in air
+    while (telemetry->in_air()) {
+        std::cout << "Vehicle is landing..." << std::endl;
+        sleep_for(seconds(1));
+    }
+    std::cout << "Landed!" << std::endl;
+
     // We are relying on auto-disarming but let's keep watching the telemetry for a bit longer.
-    sleep_for(seconds(5));
+    sleep_for(seconds(3));
     std::cout << "Finished..." << std::endl;
+
     return 0;
 }