aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Plane: use singletons in AP_Arming

Browse Source
This commit is contained in:
Peter Barker 2018-06-25 15:44:04 +10:00 committed by Peter Barker
parent cc46ab3092
commit 3bfa4c8678
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduPlane/AP_Arming.cpp
View File

@ -94,8 +94,8 @@ bool AP_Arming_Plane::ins_checks(bool display_failure)
// additional plane specific checks // additional plane specific checks
if ((checks_to_perform & ARMING_CHECK_ALL) || if ((checks_to_perform & ARMING_CHECK_ALL) ||
(checks_to_perform & ARMING_CHECK_INS)) { (checks_to_perform & ARMING_CHECK_INS)) {
if (!ahrs.healthy()) { if (!AP::ahrs().healthy()) {
const char *reason = ahrs.prearm_failure_reason(); const char *reason = AP::ahrs().prearm_failure_reason();
if (reason == nullptr) { if (reason == nullptr) {
reason = "AHRS not healthy"; reason = "AHRS not healthy";
} }

5
ArduPlane/AP_Arming.h
View File

@ -8,9 +8,8 @@
class AP_Arming_Plane : public AP_Arming class AP_Arming_Plane : public AP_Arming
{ {
public: public:
AP_Arming_Plane(const AP_AHRS &ahrs_ref, Compass &compass, AP_Arming_Plane()
const AP_BattMonitor &battery) : AP_Arming()
: AP_Arming(ahrs_ref, compass, battery)
{ {
AP_Param::setup_object_defaults(this, var_info); AP_Param::setup_object_defaults(this, var_info);
} }

2
ArduPlane/Plane.h
View File

@ -747,7 +747,7 @@ private:
#endif #endif
// Arming/Disarming mangement class // Arming/Disarming mangement class
AP_Arming_Plane arming{ahrs, compass, battery}; AP_Arming_Plane arming;
AP_Param param_loader {var_info}; AP_Param param_loader {var_info};