From dbd6cd1a581ef60e740701f46d9c6822ecb35f6b Mon Sep 17 00:00:00 2001 From: Shiv Tyagi Date: Sat, 30 Oct 2021 21:24:47 +0530 Subject: [PATCH] Rover: Copter: remove pilot_throttle_checks() This method is redundant as radio_failsafe_check() takes care of below acceptable value of throttle. --- Rover/AP_Arming.cpp | 16 +--------------- Rover/AP_Arming.h | 1 - 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/Rover/AP_Arming.cpp b/Rover/AP_Arming.cpp index b8c7a31b09..e25e3ea7da 100644 --- a/Rover/AP_Arming.cpp +++ b/Rover/AP_Arming.cpp @@ -89,8 +89,7 @@ bool AP_Arming_Rover::pre_arm_checks(bool report) & motor_checks(report) & oa_check(report) & parameter_checks(report) - & mode_checks(report) - & pilot_throttle_checks(report)); + & mode_checks(report)); } bool AP_Arming_Rover::arm_checks(AP_Arming::Method method) @@ -189,19 +188,6 @@ bool AP_Arming_Rover::parameter_checks(bool report) return true; } -// check throttle is above failsafe throttle -bool AP_Arming_Rover::pilot_throttle_checks(bool report) -{ - if ((checks_to_perform == ARMING_CHECK_ALL) || (checks_to_perform & ARMING_CHECK_RC)) { - if (rover.g.fs_throttle_enabled != FS_THR_DISABLED && rover.channel_throttle->get_radio_in() < rover.g.fs_throttle_value) { - check_failed(ARMING_CHECK_RC, report, "Throttle below failsafe"); - return false; - } - } - - return true; -} - // check if arming allowed from this mode bool AP_Arming_Rover::mode_checks(bool report) { diff --git a/Rover/AP_Arming.h b/Rover/AP_Arming.h index 94281ecec0..5925f1fdb1 100644 --- a/Rover/AP_Arming.h +++ b/Rover/AP_Arming.h @@ -32,6 +32,5 @@ protected: bool parameter_checks(bool report); bool mode_checks(bool report); bool motor_checks(bool report); - bool pilot_throttle_checks(bool report); };