From 7446a9c33cfdb45afc38ac7d59fd223dc407f875 Mon Sep 17 00:00:00 2001 From: Mark Whitehorn Date: Sun, 29 Nov 2020 08:47:13 -0700 Subject: [PATCH] AC_AttitudeControl: make relax_attitude_controllers() non-virtual --- libraries/AC_AttitudeControl/AC_AttitudeControl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/AC_AttitudeControl/AC_AttitudeControl.h b/libraries/AC_AttitudeControl/AC_AttitudeControl.h index a901722731..e291324e3b 100644 --- a/libraries/AC_AttitudeControl/AC_AttitudeControl.h +++ b/libraries/AC_AttitudeControl/AC_AttitudeControl.h @@ -109,7 +109,7 @@ public: void set_input_tc(float input_tc) { _input_tc = constrain_float(input_tc, 0.0f, 1.0f); } // Ensure attitude controller have zero errors to relax rate controller output - virtual void relax_attitude_controllers(); + void relax_attitude_controllers(); // Used by child class AC_AttitudeControl_TS to change behavior for tailsitter quadplanes virtual void relax_attitude_controllers(bool exclude_pitch) { relax_attitude_controllers(); }