From 5b41d5541f53458a0a06881a86ff35a176fec1ca Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 8 Nov 2020 21:36:40 +1100 Subject: [PATCH] AP_NavEKF2: removed use of another lanes gyro in optflow takeoff detection as discussed with Paul --- libraries/AP_NavEKF2/AP_NavEKF2_VehicleStatus.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/libraries/AP_NavEKF2/AP_NavEKF2_VehicleStatus.cpp b/libraries/AP_NavEKF2/AP_NavEKF2_VehicleStatus.cpp index 1ee458e444..e8272460ab 100644 --- a/libraries/AP_NavEKF2/AP_NavEKF2_VehicleStatus.cpp +++ b/libraries/AP_NavEKF2/AP_NavEKF2_VehicleStatus.cpp @@ -482,15 +482,7 @@ void NavEKF2_core::detectOptFlowTakeoff(void) Vector3f angRateVec; Vector3f gyroBias; getGyroBias(gyroBias); -#if INS_MAX_INSTANCES > 1 - bool dual_ins = ins.use_gyro(0) && ins.use_gyro(1); - if (dual_ins) { - angRateVec = (ins.get_gyro(0) + ins.get_gyro(1)) * 0.5f - gyroBias; - } else -#endif - { - angRateVec = ins.get_gyro() - gyroBias; - } + angRateVec = ins.get_gyro(gyro_index_active) - gyroBias; takeOffDetected = (takeOffDetected || (angRateVec.length() > 0.1f) || (rangeDataNew.rng > (rngAtStartOfFlight + 0.1f))); } else if (onGround) {