From 4cd66d54d1323dd3ed6c3720bcf9822df34f5075 Mon Sep 17 00:00:00 2001 From: Tom Pittenger Date: Fri, 12 Aug 2016 12:52:49 -0700 Subject: [PATCH] Copter: fixed adsb pre-arm error text. "Arm" and "PreArm" were swapped --- ArduCopter/arming_checks.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ArduCopter/arming_checks.cpp b/ArduCopter/arming_checks.cpp index 7b3aec91ce..0f2cccf2c8 100644 --- a/ArduCopter/arming_checks.cpp +++ b/ArduCopter/arming_checks.cpp @@ -347,7 +347,7 @@ bool Copter::pre_arm_checks(bool display_failure) // check adsb avoidance failsafe if (failsafe.adsb) { if (display_failure) { - gcs_send_text(MAV_SEVERITY_CRITICAL,"Arm: ADSB threat detected"); + gcs_send_text(MAV_SEVERITY_CRITICAL,"PreArm: ADSB threat detected"); } return false; } @@ -696,7 +696,7 @@ bool Copter::arm_checks(bool display_failure, bool arming_from_gcs) if ((g.arming_check == ARMING_CHECK_ALL) || (g.arming_check & ARMING_CHECK_PARAMETERS)) { if (failsafe.adsb) { if (display_failure) { - gcs_send_text(MAV_SEVERITY_CRITICAL,"PreArm: ADSB threat detected"); + gcs_send_text(MAV_SEVERITY_CRITICAL,"Arm: ADSB threat detected"); } return false; }