|
|
|
@ -58,7 +58,6 @@ bool AP_Arming_Copter::run_pre_arm_checks(bool display_failure)
@@ -58,7 +58,6 @@ bool AP_Arming_Copter::run_pre_arm_checks(bool display_failure)
|
|
|
|
|
|
|
|
|
|
return parameter_checks(display_failure) |
|
|
|
|
& motor_checks(display_failure) |
|
|
|
|
& pilot_throttle_checks(display_failure) |
|
|
|
|
& oa_checks(display_failure) |
|
|
|
|
& gcs_failsafe_check(display_failure) |
|
|
|
|
& winch_checks(display_failure) |
|
|
|
@ -344,25 +343,6 @@ bool AP_Arming_Copter::motor_checks(bool display_failure)
@@ -344,25 +343,6 @@ bool AP_Arming_Copter::motor_checks(bool display_failure)
|
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
bool AP_Arming_Copter::pilot_throttle_checks(bool display_failure) |
|
|
|
|
{ |
|
|
|
|
// check throttle is above failsafe throttle
|
|
|
|
|
// this is near the bottom to allow other failures to be displayed before checking pilot throttle
|
|
|
|
|
if ((checks_to_perform == ARMING_CHECK_ALL) || (checks_to_perform & ARMING_CHECK_RC)) { |
|
|
|
|
if (copter.g.failsafe_throttle != FS_THR_DISABLED && copter.channel_throttle->get_radio_in() < copter.g.failsafe_throttle_value) { |
|
|
|
|
#if FRAME_CONFIG == HELI_FRAME |
|
|
|
|
const char *failmsg = "Collective below Failsafe"; |
|
|
|
|
#else |
|
|
|
|
const char *failmsg = "Throttle below Failsafe"; |
|
|
|
|
#endif |
|
|
|
|
check_failed(ARMING_CHECK_RC, display_failure, "%s", failmsg); |
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
bool AP_Arming_Copter::oa_checks(bool display_failure) |
|
|
|
|
{ |
|
|
|
|
#if AC_OAPATHPLANNER_ENABLED == ENABLED |
|
|
|
|