aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Copter: fixed adsb pre-arm error text. "Arm" and "PreArm" were swapped

Browse Source
This commit is contained in:
Tom Pittenger 2016-08-12 12:52:49 -07:00
parent 29d4790fc7
commit 4cd66d54d1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduCopter/arming_checks.cpp
View File

@ -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;
}