Copter: auto mode takeoff complete pos fix

ArduPilot · Sep 10, 2024 · 1a3ae4e · 1a3ae4e
1 parent 1542290
commit 1a3ae4e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/ArduCopter/mode.h b/ArduCopter/mode.h
@@ -15,7 +15,7 @@ class _AutoTakeoff {
 public:
     void run();
     void start(float complete_alt_cm, bool terrain_alt);
-    bool get_position(Vector3p& completion_pos);
+    bool get_completion_pos(Vector3p& pos_neu_cm);
 
     bool complete;          // true when takeoff is complete
 

diff --git a/ArduCopter/mode_auto.cpp b/ArduCopter/mode_auto.cpp
@@ -427,7 +427,7 @@ bool ModeAuto::wp_start(const Location& dest_loc)
         Vector3f stopping_point;
         if (_mode == SubMode::TAKEOFF) {
             Vector3p takeoff_complete_pos;
-            if (auto_takeoff.get_position(takeoff_complete_pos)) {
+            if (auto_takeoff.get_completion_pos(takeoff_complete_pos)) {
                 stopping_point = takeoff_complete_pos.tofloat();
             }
         }

diff --git a/ArduCopter/takeoff.cpp b/ArduCopter/takeoff.cpp
@@ -239,15 +239,15 @@ void _AutoTakeoff::start(float _complete_alt_cm, bool _terrain_alt)
     }
 }
 
-// return takeoff final position if takeoff has completed successfully
-bool _AutoTakeoff::get_position(Vector3p& _complete_pos)
+// return takeoff final target position in cm from the EKF origin if takeoff has completed successfully
+bool _AutoTakeoff::get_completion_pos(Vector3p& pos_neu_cm)
 {
     // only provide location if takeoff has completed
     if (!complete) {
         return false;
     }
 
-    complete_pos = _complete_pos;
+    pos_neu_cm = complete_pos;
     return true;
 }