From a38092e220655cff11826eabb9567d972f48f06a Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Wed, 6 Mar 2019 10:10:09 +1100 Subject: [PATCH] Rover: move checking of fence up --- APMrover2/AP_Arming.cpp | 13 ------------- APMrover2/AP_Arming.h | 1 - 2 files changed, 14 deletions(-) diff --git a/APMrover2/AP_Arming.cpp b/APMrover2/AP_Arming.cpp index 1287f7064d..16d8ae89af 100644 --- a/APMrover2/AP_Arming.cpp +++ b/APMrover2/AP_Arming.cpp @@ -84,19 +84,6 @@ bool AP_Arming_Rover::pre_arm_checks(bool report) & proximity_check(report)); } -bool AP_Arming_Rover::fence_checks(bool report) -{ - // check fence is initialised - const char *fail_msg = nullptr; - if (!rover.g2.fence.pre_arm_check(fail_msg)) { - if (report && fail_msg != nullptr) { - gcs().send_text(MAV_SEVERITY_CRITICAL, "PreArm: Fence : %s", fail_msg); - } - return false; - } - return true; -} - // check nothing is too close to vehicle bool AP_Arming_Rover::proximity_check(bool report) { diff --git a/APMrover2/AP_Arming.h b/APMrover2/AP_Arming.h index 5d3b1147e2..e6d9162f1e 100644 --- a/APMrover2/AP_Arming.h +++ b/APMrover2/AP_Arming.h @@ -21,7 +21,6 @@ public: bool gps_checks(bool display_failure) override; protected: - bool fence_checks(bool report); bool proximity_check(bool report); private: