From 55f51eabe8fa04d196194f06eeaeca51a36e385f Mon Sep 17 00:00:00 2001 From: Iampete1 Date: Thu, 25 Jul 2024 00:14:28 +0100 Subject: [PATCH] Plane: move `have_autoenabled_fences` to be private in `ModeTakeoff` --- ArduPlane/Plane.h | 3 --- ArduPlane/mode.h | 6 ++++++ ArduPlane/mode_takeoff.cpp | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ArduPlane/Plane.h b/ArduPlane/Plane.h index 10bca62c8a..4a78dd32e9 100644 --- a/ArduPlane/Plane.h +++ b/ArduPlane/Plane.h @@ -250,9 +250,6 @@ private: // are we currently in long failsafe but have postponed it in MODE TAKEOFF until min level alt is reached bool long_failsafe_pending; - - //flag that we have already called autoenable fences once in MODE TAKEOFF - bool have_autoenabled_fences; // GCS selection GCS_Plane _gcs; // avoid using this; use gcs() diff --git a/ArduPlane/mode.h b/ArduPlane/mode.h index cfe306813b..955a66bbc8 100644 --- a/ArduPlane/mode.h +++ b/ArduPlane/mode.h @@ -816,6 +816,12 @@ protected: Location start_loc; bool _enter() override; + +private: + + // flag that we have already called autoenable fences once in MODE TAKEOFF + bool have_autoenabled_fences; + }; #if HAL_SOARING_ENABLED diff --git a/ArduPlane/mode_takeoff.cpp b/ArduPlane/mode_takeoff.cpp index 325e8cab2d..cf51814571 100644 --- a/ArduPlane/mode_takeoff.cpp +++ b/ArduPlane/mode_takeoff.cpp @@ -63,7 +63,7 @@ ModeTakeoff::ModeTakeoff() : bool ModeTakeoff::_enter() { takeoff_mode_setup = false; - plane.have_autoenabled_fences = false; + have_autoenabled_fences = false; return true; } @@ -155,9 +155,9 @@ void ModeTakeoff::update() } else { if ((altitude_cm >= alt * 100 - 200)) { //within 2m of TKOFF_ALT, or above and loitering #if AP_FENCE_ENABLED - if (!plane.have_autoenabled_fences) { + if (!have_autoenabled_fences) { plane.fence.auto_enable_fence_after_takeoff(); - plane.have_autoenabled_fences = true; + have_autoenabled_fences = true; } #endif plane.calc_nav_roll();