Browse Source

Rover: move checking of fence up

mission-4.1.18
Peter Barker 6 years ago committed by Randy Mackay
parent
commit
a38092e220
  1. 13
      APMrover2/AP_Arming.cpp
  2. 1
      APMrover2/AP_Arming.h

13
APMrover2/AP_Arming.cpp

@ -84,19 +84,6 @@ bool AP_Arming_Rover::pre_arm_checks(bool report) @@ -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)
{

1
APMrover2/AP_Arming.h

@ -21,7 +21,6 @@ public: @@ -21,7 +21,6 @@ public:
bool gps_checks(bool display_failure) override;
protected:
bool fence_checks(bool report);
bool proximity_check(bool report);
private:

Loading…
Cancel
Save