mirror of
https://github.com/ArduPilot/ardupilot
synced 2025-01-03 06:28:27 -04:00
9f9531a790
This makes the arbitrary decision that arming checks always report
failures to the GCS.
Fixes:
In file included from ../../ArduCopter/events.cpp:1:
In file included from ../../ArduCopter/Copter.h:91:
../../ArduCopter/AP_Arming.h:33:69: fatal error: non-virtual member function marked 'override' hides virtual member function
bool arm_checks(bool display_failure, AP_Arming::Method method) override;
^
../../libraries/AP_Arming/AP_Arming.h:64:18: note: hidden overloaded virtual function 'AP_Arming::arm_checks' declared here: different number of parameters (1 vs 2)
virtual bool arm_checks(AP_Arming::Method method);
^
1 error generated.
52 lines
1.5 KiB
C++
52 lines
1.5 KiB
C++
#pragma once
|
|
|
|
#include <AP_Arming/AP_Arming.h>
|
|
|
|
class AP_Arming_Copter : public AP_Arming
|
|
{
|
|
public:
|
|
friend class Copter;
|
|
friend class ToyMode;
|
|
|
|
AP_Arming_Copter() : AP_Arming()
|
|
{
|
|
// default REQUIRE parameter to 1 (Copter does not have an
|
|
// actual ARMING_REQUIRE parameter)
|
|
require.set_default((uint8_t)Required::YES_MIN_PWM);
|
|
}
|
|
|
|
/* Do not allow copies */
|
|
AP_Arming_Copter(const AP_Arming_Copter &other) = delete;
|
|
AP_Arming_Copter &operator=(const AP_Arming_Copter&) = delete;
|
|
|
|
void update(void);
|
|
bool all_checks_passing(AP_Arming::Method method);
|
|
|
|
bool rc_calibration_checks(bool display_failure) override;
|
|
|
|
protected:
|
|
|
|
bool pre_arm_checks(bool display_failure) override;
|
|
bool pre_arm_ekf_attitude_check();
|
|
bool pre_arm_terrain_check(bool display_failure);
|
|
bool pre_arm_proximity_check(bool display_failure);
|
|
bool arm_checks(AP_Arming::Method method) override;
|
|
|
|
// 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;
|
|
|
|
// NOTE! the following check functions *DO NOT* call into AP_Arming!
|
|
bool parameter_checks(bool display_failure);
|
|
bool motor_checks(bool display_failure);
|
|
bool pilot_throttle_checks(bool display_failure);
|
|
|
|
void set_pre_arm_check(bool b);
|
|
|
|
private:
|
|
|
|
};
|