Copter: ModeGuided: add an option_is_enabled method, use it

Author: peterbarker

ArduCopter/mode.h

@@ -1127,7 +1127,7 @@ class ModeGuided : public Mode {
 private:
 
     // enum for GUID_OPTIONS parameter
-    enum class Options : int32_t {
+    enum class Option : int32_t {
         AllowArmingFromTX   = (1U << 0),
         // this bit is still available, pilot yaw was mapped to bit 2 for symmetry with auto
         IgnorePilotYaw      = (1U << 2),
@@ -1138,6 +1138,8 @@ class ModeGuided : public Mode {
         AllowWeatherVaning = (1U << 7)
     };
 
+    bool option_is_enabled(Option option) const;
+
     // wp controller
     void wp_control_start();
     void wp_control_run();

ArduCopter/mode_guided.cpp

@@ -97,6 +97,11 @@ void ModeGuided::run()
     }
  }
 
+bool ModeGuided::option_is_enabled(Option option) const
+{
+    return copter.g2.guided_options.get() & (uint32_t)option) != 0;
+}
+
 bool ModeGuided::allows_arming(AP_Arming::Method method) const
 {
     // always allow arming from the ground station or scripting
@@ -105,13 +110,13 @@ bool ModeGuided::allows_arming(AP_Arming::Method method) const
     }
 
     // optionally allow arming from the transmitter
-    return (copter.g2.guided_options & (uint32_t)Options::AllowArmingFromTX) != 0;
+    return option_is_enabled(Option::AllowArmingFromTX);
 };
 
 #if WEATHERVANE_ENABLED == ENABLED
 bool ModeGuided::allows_weathervaning() const
 {
-    return (copter.g2.guided_options.get() & (uint32_t)Options::AllowWeatherVaning) != 0;
+    return option_is_enabled(Option::AllowWeatherVaning);
 }
 #endif
 
@@ -607,25 +612,25 @@ bool ModeGuided::set_destination_posvelaccel(const Vector3f& destination, const
 // returns true if GUIDED_OPTIONS param suggests SET_ATTITUDE_TARGET's "thrust" field should be interpreted as thrust instead of climb rate
 bool ModeGuided::set_attitude_target_provides_thrust() const
 {
-    return ((copter.g2.guided_options.get() & uint32_t(Options::SetAttitudeTarget_ThrustAsThrust)) != 0);
+    return option_is_enabled(Option::SetAttitudeTarget_ThrustAsThrust);
 }
 
 // returns true if GUIDED_OPTIONS param specifies position should be controlled (when velocity and/or acceleration control is active)
 bool ModeGuided::stabilizing_pos_xy() const
 {
-    return !((copter.g2.guided_options.get() & uint32_t(Options::DoNotStabilizePositionXY)) != 0);
+    return !option_is_enabled(Option::DoNotStabilizePositionXY);
 }
 
 // returns true if GUIDED_OPTIONS param specifies velocity should  be controlled (when acceleration control is active)
 bool ModeGuided::stabilizing_vel_xy() const
 {
-    return !((copter.g2.guided_options.get() & uint32_t(Options::DoNotStabilizeVelocityXY)) != 0);
+    return !option_is_enabled(Option::DoNotStabilizeVelocityXY);
 }
 
 // returns true if GUIDED_OPTIONS param specifies waypoint navigation should be used for position control (allow path planning to be used but updates must be slower)
 bool ModeGuided::use_wpnav_for_position_control() const
 {
-    return ((copter.g2.guided_options.get() & uint32_t(Options::WPNavUsedForPosControl)) != 0);
+    return option_is_enabled(Option::WPNavUsedForPosControl);
 }
 
 // Sets guided's angular target submode: Using a rotation quaternion, angular velocity, and climbrate or thrust (depends on user option)