diff --git a/libraries/AP_Arming/AP_Arming.cpp b/libraries/AP_Arming/AP_Arming.cpp index 8d7b34e24c..49e3e6f7e3 100644 --- a/libraries/AP_Arming/AP_Arming.cpp +++ b/libraries/AP_Arming/AP_Arming.cpp @@ -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 }; diff --git a/libraries/AP_Arming/AP_Arming.h b/libraries/AP_Arming/AP_Arming.h index 4d031ae9be..e75fa94981 100644 --- a/libraries/AP_Arming/AP_Arming.h +++ b/libraries/AP_Arming/AP_Arming.h @@ -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;