From e30a6bbce3691bd061271672f24cbfb64e6aa6b3 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Wed, 27 Dec 2017 15:31:32 +1100 Subject: [PATCH] AC_Fence: rename sys_status methods from geofence_ to sys_status_ --- libraries/AC_Fence/AC_Fence.cpp | 10 +++++----- libraries/AC_Fence/AC_Fence.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libraries/AC_Fence/AC_Fence.cpp b/libraries/AC_Fence/AC_Fence.cpp index e364e4d8e2..f19035089d 100644 --- a/libraries/AC_Fence/AC_Fence.cpp +++ b/libraries/AC_Fence/AC_Fence.cpp @@ -558,14 +558,14 @@ bool AC_Fence::load_polygon_from_eeprom(bool force_reload) } // methods for mavlink SYS_STATUS message (send_extended_status1) -bool AC_Fence::geofence_present() const +bool AC_Fence::sys_status_present() const { return _enabled; } -bool AC_Fence::geofence_enabled() const +bool AC_Fence::sys_status_enabled() const { - if (!geofence_present()) { + if (!sys_status_present()) { return false; } if (_action == AC_FENCE_ACTION_REPORT_ONLY) { @@ -574,9 +574,9 @@ bool AC_Fence::geofence_enabled() const return true; } -bool AC_Fence::geofence_failed() const +bool AC_Fence::sys_status_failed() const { - if (!geofence_present()) { + if (!sys_status_present()) { // not failed if not present; can fail if present but not enabled return false; } diff --git a/libraries/AC_Fence/AC_Fence.h b/libraries/AC_Fence/AC_Fence.h index babd0b4c7c..3a43316ee2 100644 --- a/libraries/AC_Fence/AC_Fence.h +++ b/libraries/AC_Fence/AC_Fence.h @@ -109,9 +109,9 @@ public: static const struct AP_Param::GroupInfo var_info[]; // methods for mavlink SYS_STATUS message (send_extended_status1) - bool geofence_present() const; - bool geofence_enabled() const; - bool geofence_failed() const; + bool sys_status_present() const; + bool sys_status_enabled() const; + bool sys_status_failed() const; private: