diff --git a/ArduPlane/AP_Arming.cpp b/ArduPlane/AP_Arming.cpp index 0bae9256eb..54fd8d2f76 100644 --- a/ArduPlane/AP_Arming.cpp +++ b/ArduPlane/AP_Arming.cpp @@ -94,8 +94,8 @@ bool AP_Arming_Plane::ins_checks(bool display_failure) // additional plane specific checks if ((checks_to_perform & ARMING_CHECK_ALL) || (checks_to_perform & ARMING_CHECK_INS)) { - if (!ahrs.healthy()) { - const char *reason = ahrs.prearm_failure_reason(); + if (!AP::ahrs().healthy()) { + const char *reason = AP::ahrs().prearm_failure_reason(); if (reason == nullptr) { reason = "AHRS not healthy"; } diff --git a/ArduPlane/AP_Arming.h b/ArduPlane/AP_Arming.h index 172354286d..3853d72158 100644 --- a/ArduPlane/AP_Arming.h +++ b/ArduPlane/AP_Arming.h @@ -8,9 +8,8 @@ class AP_Arming_Plane : public AP_Arming { public: - AP_Arming_Plane(const AP_AHRS &ahrs_ref, Compass &compass, - const AP_BattMonitor &battery) - : AP_Arming(ahrs_ref, compass, battery) + AP_Arming_Plane() + : AP_Arming() { AP_Param::setup_object_defaults(this, var_info); } diff --git a/ArduPlane/Plane.h b/ArduPlane/Plane.h index cb8faf12e1..286e9fa973 100644 --- a/ArduPlane/Plane.h +++ b/ArduPlane/Plane.h @@ -747,7 +747,7 @@ private: #endif // Arming/Disarming mangement class - AP_Arming_Plane arming{ahrs, compass, battery}; + AP_Arming_Plane arming; AP_Param param_loader {var_info};