Browse Source

Copter: remove override compass check

gps-1.3.1
Iampete1 4 years ago committed by Andrew Tridgell
parent
commit
1301372bfd
  1. 17
      ArduCopter/AP_Arming.cpp
  2. 1
      ArduCopter/AP_Arming.h

17
ArduCopter/AP_Arming.cpp

@ -90,23 +90,6 @@ bool AP_Arming_Copter::barometer_checks(bool display_failure) @@ -90,23 +90,6 @@ bool AP_Arming_Copter::barometer_checks(bool display_failure)
return ret;
}
bool AP_Arming_Copter::compass_checks(bool display_failure)
{
bool ret = AP_Arming::compass_checks(display_failure);
if ((checks_to_perform == ARMING_CHECK_ALL) || (checks_to_perform & ARMING_CHECK_COMPASS)) {
// check compass offsets have been set. AP_Arming only checks
// this if learning is off; Copter *always* checks.
char failure_msg[50] = {};
if (!AP::compass().configured(failure_msg, ARRAY_SIZE(failure_msg))) {
check_failed(ARMING_CHECK_COMPASS, display_failure, "%s", failure_msg);
ret = false;
}
}
return ret;
}
bool AP_Arming_Copter::ins_checks(bool display_failure)
{
bool ret = AP_Arming::ins_checks(display_failure);

1
ArduCopter/AP_Arming.h

@ -38,7 +38,6 @@ protected: @@ -38,7 +38,6 @@ protected:
// NOTE! the following check functions *DO* call into AP_Arming:
bool ins_checks(bool display_failure) override;
bool compass_checks(bool display_failure) override;
bool gps_checks(bool display_failure) override;
bool barometer_checks(bool display_failure) override;
bool board_voltage_checks(bool display_failure) override;

Loading…
Cancel
Save