Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-26 17:53:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Plane: convert landing.complete to landing.is_complete()

Browse Source
This commit is contained in:
Tom Pittenger 2016-12-12 00:47:52 -08:00
parent 3e2098192b
commit b7b56b94a3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ArduPlane/ArduPlane.cpp
View File

@ -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()) {

2
ArduPlane/servos.cpp
View File

@ -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.