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

AP_Arming: make constructor protected

Browse Source
This commit is contained in:
Lucas De Marchi 2017-08-30 13:09:05 -07:00 committed by Francisco Ferreira
parent b36a5919f5
commit 39aee74b29
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_Arming/AP_Arming.h
View File

@ -38,9 +38,6 @@ public:
YES_ZERO_PWM = 2 YES_ZERO_PWM = 2
}; };
AP_Arming(const AP_AHRS &ahrs_ref, const AP_Baro &baro, Compass &compass,
const AP_BattMonitor &battery);
// these functions should not be used by Copter which holds the armed state in the motors library // these functions should not be used by Copter which holds the armed state in the motors library
ArmingRequired arming_required(); ArmingRequired arming_required();
virtual bool arm(uint8_t method); virtual bool arm(uint8_t method);
@ -64,6 +61,9 @@ public:
static const struct AP_Param::GroupInfo var_info[]; static const struct AP_Param::GroupInfo var_info[];
protected: protected:
AP_Arming(const AP_AHRS &ahrs_ref, const AP_Baro &baro, Compass &compass,
const AP_BattMonitor &battery);
// Parameters // Parameters
AP_Int8 require; AP_Int8 require;
AP_Int16 checks_to_perform; // bitmask for which checks are required AP_Int16 checks_to_perform; // bitmask for which checks are required