Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rover: remove redundant PreArm: in check_failed calls

This commit is contained in:
Peter Barker 2019-03-06 21:20:26 +11:00 committed by Randy Mackay
parent 7b6fef16aa
commit a17dbbe856
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
APMrover2/AP_Arming.cpp
View File

@ -49,9 +49,7 @@ bool AP_Arming_Rover::gps_checks(bool display_failure)
// check for ekf failsafe
if (rover.failsafe.ekf) {
if (display_failure) {
gcs().send_text(MAV_SEVERITY_CRITICAL, "PreArm: EKF failsafe");
}
check_failed(ARMING_CHECK_NONE, display_failure, "EKF failsafe");
return false;
}
@ -72,9 +70,7 @@ bool AP_Arming_Rover::gps_checks(bool display_failure)
bool AP_Arming_Rover::pre_arm_checks(bool report)
{
if (SRV_Channels::get_emergency_stop()) {
if (report) {
gcs().send_text(MAV_SEVERITY_CRITICAL,"PreArm: Motors Emergency Stopped");
}
check_failed(ARMING_CHECK_NONE, report, "Motors Emergency Stopped");
return false;
}
@ -94,9 +90,7 @@ bool AP_Arming_Rover::proximity_check(bool report)
// return false if proximity sensor unhealthy
if (rover.g2.proximity.get_status() < AP_Proximity::Proximity_Good) {
if (report) {
gcs().send_text(MAV_SEVERITY_CRITICAL,"PreArm: check proximity sensor");
}
check_failed(ARMING_CHECK_NONE, report, "check proximity sensor");
return false;
}