diff --git a/ArduSub/AP_Arming_Sub.cpp b/ArduSub/AP_Arming_Sub.cpp index d566a000e4..c623be8b84 100644 --- a/ArduSub/AP_Arming_Sub.cpp +++ b/ArduSub/AP_Arming_Sub.cpp @@ -6,7 +6,7 @@ enum HomeState AP_Arming_Sub::home_status() const return sub.ap.home_state; } -bool AP_Arming_Sub::rc_check(bool display_failure) +bool AP_Arming_Sub::rc_calibration_checks(bool display_failure) { const RC_Channel *channels[] = { sub.channel_roll, @@ -23,7 +23,7 @@ bool AP_Arming_Sub::pre_arm_checks(bool report) return true; } - return AP_Arming::pre_arm_checks(report) & rc_check(report) & ins_checks(report); + return AP_Arming::pre_arm_checks(report) & ins_checks(report); } bool AP_Arming_Sub::ins_checks(bool report) diff --git a/ArduSub/AP_Arming_Sub.h b/ArduSub/AP_Arming_Sub.h index f4ebf4f74b..1454862cc9 100644 --- a/ArduSub/AP_Arming_Sub.h +++ b/ArduSub/AP_Arming_Sub.h @@ -14,7 +14,7 @@ public: AP_Arming_Sub(const AP_Arming_Sub &other) = delete; AP_Arming_Sub &operator=(const AP_Baro&) = delete; - bool rc_check(bool report=true); + bool rc_calibration_checks(bool report=true) override; bool pre_arm_checks(bool report) override; protected: diff --git a/ArduSub/radio.cpp b/ArduSub/radio.cpp index 88220604af..841276347f 100644 --- a/ArduSub/radio.cpp +++ b/ArduSub/radio.cpp @@ -54,7 +54,7 @@ void Sub::init_rc_out() motors.set_throttle_range(channel_throttle->get_radio_min(), channel_throttle->get_radio_max()); // enable output to motors - if (arming.rc_check()) { + if (arming.rc_calibration_checks(true)) { enable_motor_output(); }