From a1bf791529257fbbb35bdd2b1f67e87becd43498 Mon Sep 17 00:00:00 2001 From: Tom Pittenger Date: Sat, 13 Aug 2016 02:04:15 -0700 Subject: [PATCH] Copter: do not report collision warning when action is COLLISION_ACTION_NONE: --- ArduCopter/avoidance_adsb.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/ArduCopter/avoidance_adsb.cpp b/ArduCopter/avoidance_adsb.cpp index ae280e2294..64894e463f 100644 --- a/ArduCopter/avoidance_adsb.cpp +++ b/ArduCopter/avoidance_adsb.cpp @@ -78,6 +78,7 @@ MAV_COLLISION_ACTION AP_Avoidance_Copter::handle_avoidance(const AP_Avoidance::O // unsupported actions and those that require no response case MAV_COLLISION_ACTION_NONE: + return actual_action; case MAV_COLLISION_ACTION_REPORT: default: break;