From b7b56b94a35b7474ed8bf5ffaa54165e18059892 Mon Sep 17 00:00:00 2001 From: Tom Pittenger Date: Mon, 12 Dec 2016 00:47:52 -0800 Subject: [PATCH] Plane: convert landing.complete to landing.is_complete() --- ArduPlane/ArduPlane.cpp | 6 +++--- ArduPlane/servos.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ArduPlane/ArduPlane.cpp b/ArduPlane/ArduPlane.cpp index 478b87d7a1..1c0dc0f20b 100644 --- a/ArduPlane/ArduPlane.cpp +++ b/ArduPlane/ArduPlane.cpp @@ -551,7 +551,7 @@ void Plane::handle_auto_mode(void) calc_nav_roll(); calc_nav_pitch(); - if (landing.complete) { + if (landing.is_complete()) { // during final approach constrain roll to the range // allowed for level flight nav_roll_cd = constrain_int32(nav_roll_cd, -g.level_roll_limit*100UL, g.level_roll_limit*100UL); @@ -981,7 +981,7 @@ void Plane::update_flight_stage(void) } else if (landing.get_abort_throttle_enable() && channel_throttle->get_control_in() >= 90) { plane.gcs_send_text(MAV_SEVERITY_INFO,"Landing aborted via throttle"); set_flight_stage(AP_SpdHgtControl::FLIGHT_LAND_ABORT); - } else if (landing.complete == true) { + } else if (landing.is_complete()) { set_flight_stage(AP_SpdHgtControl::FLIGHT_LAND_FINAL); } else if (landing.pre_flare == true) { set_flight_stage(AP_SpdHgtControl::FLIGHT_LAND_PREFLARE); @@ -1057,7 +1057,7 @@ void Plane::update_optical_flow(void) void Plane::disarm_if_autoland_complete() { if (landing.get_disarm_delay() > 0 && - landing.complete && + landing.is_complete() && !is_flying() && arming.arming_required() != AP_Arming::NO && arming.is_armed()) { diff --git a/ArduPlane/servos.cpp b/ArduPlane/servos.cpp index 3a590ac299..304ccb6add 100644 --- a/ArduPlane/servos.cpp +++ b/ArduPlane/servos.cpp @@ -774,7 +774,7 @@ void Plane::set_servos(void) if (landing.get_then_servos_neutral() > 0 && control_mode == AUTO && landing.get_disarm_delay() > 0 && - landing.complete && + landing.is_complete() && !arming.is_armed()) { // after an auto land and auto disarm, set the servos to be neutral just // in case we're upside down or some crazy angle and straining the servos.