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

Plane: rename arming_checks to AP_Arming

Browse Source
This commit is contained in:
Randy Mackay 2017-01-09 16:56:56 +09:00
parent fc28beacea
commit 7cc8b7232c
3 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ArduPlane/arming_checks.cpp → ArduPlane/AP_Arming.cpp
View File

@ -1,6 +1,7 @@
/* /*
additional arming checks for plane additional arming checks for plane
*/ */
#include "AP_Arming.h"
#include "Plane.h" #include "Plane.h"
const AP_Param::GroupInfo AP_Arming_Plane::var_info[] = { const AP_Param::GroupInfo AP_Arming_Plane::var_info[] = {

28
ArduPlane/AP_Arming.h Normal file
View File

@ -0,0 +1,28 @@
#pragma once
#include <AP_Arming/AP_Arming.h>
/*
a plane specific arming class
*/
class AP_Arming_Plane : public AP_Arming
{
public:
AP_Arming_Plane(const AP_AHRS &ahrs_ref, const AP_Baro &baro, Compass &compass,
const AP_BattMonitor &battery) :
AP_Arming(ahrs_ref, baro, compass, battery) {
AP_Param::setup_object_defaults(this, var_info);
}
bool pre_arm_checks(bool report);
bool arm(uint8_t method) override;
// var_info for holding Parameter information
static const struct AP_Param::GroupInfo var_info[];
protected:
bool ins_checks(bool report);
enum HomeState home_status() const override;
// parameters
AP_Int8 rudder_arming_value;
};

24
ArduPlane/Plane.h
View File

@ -106,34 +106,12 @@
#include "Parameters.h" #include "Parameters.h"
#include "avoidance_adsb.h" #include "avoidance_adsb.h"
#include "AP_Arming.h"
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL #if CONFIG_HAL_BOARD == HAL_BOARD_SITL
#include <SITL/SITL.h> #include <SITL/SITL.h>
#endif #endif
/*
a plane specific arming class
*/
class AP_Arming_Plane : public AP_Arming
{
public:
AP_Arming_Plane(const AP_AHRS &ahrs_ref, const AP_Baro &baro, Compass &compass,
const AP_BattMonitor &battery) :
AP_Arming(ahrs_ref, baro, compass, battery) {
AP_Param::setup_object_defaults(this, var_info);
}
bool pre_arm_checks(bool report);
bool arm(uint8_t method) override;
// var_info for holding Parameter information
static const struct AP_Param::GroupInfo var_info[];
protected:
bool ins_checks(bool report);
enum HomeState home_status() const override;
};
/* /*
a plane specific AP_AdvancedFailsafe class a plane specific AP_AdvancedFailsafe class
*/ */