From dc85ffa83445bf66d88cb1fd057eeb016bab8c13 Mon Sep 17 00:00:00 2001 From: Tom Pittenger Date: Fri, 25 Nov 2016 16:45:23 -0800 Subject: [PATCH] Plane: move jump_to_landing_sequence() to AP_Mission --- ArduPlane/ArduPlane.cpp | 4 ++-- ArduPlane/GCS_Mavlink.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ArduPlane/ArduPlane.cpp b/ArduPlane/ArduPlane.cpp index 937569f776..742719e3a8 100644 --- a/ArduPlane/ArduPlane.cpp +++ b/ArduPlane/ArduPlane.cpp @@ -803,7 +803,7 @@ void Plane::update_navigation() reached_loiter_target() && labs(altitude_error_cm) < 1000) { // we've reached the RTL point, see if we have a landing sequence - if (landing.jump_to_landing_sequence()) { + if (mission.jump_to_landing_sequence()) { // switch from RTL -> AUTO set_mode(AUTO, MODE_REASON_UNKNOWN); } @@ -815,7 +815,7 @@ void Plane::update_navigation() else if (g.rtl_autoland == 2 && !auto_state.checked_for_autoland) { // Go directly to the landing sequence - if (landing.jump_to_landing_sequence()) { + if (mission.jump_to_landing_sequence()) { // switch from RTL -> AUTO set_mode(AUTO, MODE_REASON_UNKNOWN); } diff --git a/ArduPlane/GCS_Mavlink.cpp b/ArduPlane/GCS_Mavlink.cpp index 275ce38b5d..a7e188d866 100644 --- a/ArduPlane/GCS_Mavlink.cpp +++ b/ArduPlane/GCS_Mavlink.cpp @@ -1335,7 +1335,7 @@ void GCS_MAVLINK_Plane::handleMessage(mavlink_message_t* msg) result = MAV_RESULT_FAILED; // attempt to switch to next DO_LAND_START command in the mission - if (plane.landing.jump_to_landing_sequence()) { + if (plane.mission.jump_to_landing_sequence()) { plane.set_mode(AUTO, MODE_REASON_UNKNOWN); result = MAV_RESULT_ACCEPTED; }