Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-22 15:53:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Arming: add ARMING_OPTIONS param

Browse Source
This commit is contained in:
Tatsuya Yamaguchi 2022-01-27 09:51:02 +09:00 committed by Randy Mackay
parent ce8405b7a4
commit 02f966a35d
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/AP_Arming/AP_Arming.cpp
View File

@ -128,6 +128,13 @@ const AP_Param::GroupInfo AP_Arming::var_info[] = {
// @User: Standard
AP_GROUPINFO("CHECK", 8, AP_Arming, checks_to_perform, ARMING_CHECK_ALL),
// @Param: OPTIONS
// @DisplayName: Arming options
// @Description: Options that can be applied to change arming behaviour
// @Values: 0:None,1:Disable prearm display
// @User: Advanced
AP_GROUPINFO_FRAME("OPTIONS", 9, AP_Arming, _arming_options, 0, AP_PARAM_FRAME_COPTER),
AP_GROUPEND
};

10
libraries/AP_Arming/AP_Arming.h
View File

@ -122,7 +122,12 @@ public:
// method that was last used for disarm; invalid unless the
// vehicle has been disarmed at least once.
Method last_disarm_method() const { return _last_disarm_method; }
Method last_disarm_method() const { return _last_disarm_method; }
// enum for ARMING_OPTIONS parameter
enum class ArmingOptions : int32_t {
DISABLE_PREARM_DISPLAY = (1U << 0),
};
protected:
@ -131,7 +136,8 @@ protected:
AP_Int32 checks_to_perform; // bitmask for which checks are required
AP_Float accel_error_threshold;
AP_Int8 _rudder_arming;
AP_Int32 _required_mission_items;
AP_Int32 _required_mission_items;
AP_Int32 _arming_options;
// internal members
bool armed;