From 34a850e1a59b7d2eda46882b8fc5a701baeb3c50 Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Wed, 28 Dec 2016 14:43:31 +0900 Subject: [PATCH] AP_Arming: formatting and comment fixes No functional change --- libraries/AP_Arming/AP_Arming.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libraries/AP_Arming/AP_Arming.h b/libraries/AP_Arming/AP_Arming.h index fcfe6d86ba..1a3869f9fe 100644 --- a/libraries/AP_Arming/AP_Arming.h +++ b/libraries/AP_Arming/AP_Arming.h @@ -45,22 +45,23 @@ public: virtual bool arm(uint8_t method); bool disarm(); bool is_armed(); + + // get bitmask of enabled checks uint16_t get_enabled_checks(); - /* - pre_arm_checks() is virtual so it can be modified - in a vehicle specific subclass - */ + // pre_arm_checks() is virtual so it can be modified in a vehicle specific subclass virtual bool pre_arm_checks(bool report); + // some arming checks have side-effects, or require some form of state - // change to have occured, and thus should not be done as pre-arm + // change to have occurred, and thus should not be done as pre-arm // checks. Those go here: bool arm_checks(uint8_t method); - static const struct AP_Param::GroupInfo var_info[]; - + // get expected magnetic field strength uint16_t compass_magfield_expected() const; + static const struct AP_Param::GroupInfo var_info[]; + protected: // Parameters AP_Int8 require;