Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Copter: rename land_maybe_complete function

This commit is contained in:
Randy Mackay 2014-09-19 16:28:11 +09:00
parent 5f909f1a73
commit 93dbfd009e
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduCopter/control_auto.pde
View File

@ -287,8 +287,8 @@ static void auto_land_run()
return;
}
// init loiter targets when maybe landed
if(land_maybe_complete()) {
// relax loiter targets if we might be landed
if (land_complete_maybe()) {
wp_nav.loiter_soften_for_landing();
}

6
ArduCopter/control_land.pde
View File

@ -74,7 +74,7 @@ static void land_gps_run()
}
// relax loiter target if we might be landed
if(land_maybe_complete()) {
if (land_complete_maybe()) {
wp_nav.loiter_soften_for_landing();
}
@ -192,8 +192,8 @@ static float get_throttle_land()
}
}
// land_maybe_complete - return true if we may have landed (used to reset loiter targets during landing)
static bool land_maybe_complete()
// land_complete_maybe - return true if we may have landed (used to reset loiter targets during landing)
static bool land_complete_maybe()
{
return (ap.land_complete || ap.land_complete_maybe);
}

2
ArduCopter/control_loiter.pde
View File

@ -69,7 +69,7 @@ static void loiter_run()
}
// relax loiter target if we might be landed
if (land_maybe_complete()) {
if (land_complete_maybe()) {
wp_nav.loiter_soften_for_landing();
}

2
ArduCopter/control_poshold.pde
View File

@ -184,7 +184,7 @@ static void poshold_run()
}
// relax loiter target if we might be landed
if(land_maybe_complete()) {
if (land_complete_maybe()) {
wp_nav.loiter_soften_for_landing();
}

2
ArduCopter/control_rtl.pde
View File

@ -350,7 +350,7 @@ static void rtl_land_run()
}
// relax loiter target if we might be landed
if(land_maybe_complete()) {
if (land_complete_maybe()) {
wp_nav.loiter_soften_for_landing();
}