Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-08 17:08:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

AC_Fence: rename sys_status methods from geofence_ to sys_status_

Browse Source
This commit is contained in:
Peter Barker 2017-12-27 15:31:32 +11:00 committed by Francisco Ferreira
parent a5aafab7ff
commit e30a6bbce3
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/AC_Fence/AC_Fence.cpp
View File

@ -558,14 +558,14 @@ bool AC_Fence::load_polygon_from_eeprom(bool force_reload)
} }
// methods for mavlink SYS_STATUS message (send_extended_status1) // methods for mavlink SYS_STATUS message (send_extended_status1)
bool AC_Fence::geofence_present() const bool AC_Fence::sys_status_present() const
{ {
return _enabled; return _enabled;
} }
bool AC_Fence::geofence_enabled() const bool AC_Fence::sys_status_enabled() const
{ {
if (!geofence_present()) { if (!sys_status_present()) {
return false; return false;
} }
if (_action == AC_FENCE_ACTION_REPORT_ONLY) { if (_action == AC_FENCE_ACTION_REPORT_ONLY) {
@ -574,9 +574,9 @@ bool AC_Fence::geofence_enabled() const
return true; 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 // not failed if not present; can fail if present but not enabled
return false; return false;
} }

6
libraries/AC_Fence/AC_Fence.h
View File

@ -109,9 +109,9 @@ public:
static const struct AP_Param::GroupInfo var_info[]; static const struct AP_Param::GroupInfo var_info[];
// methods for mavlink SYS_STATUS message (send_extended_status1) // methods for mavlink SYS_STATUS message (send_extended_status1)
bool geofence_present() const; bool sys_status_present() const;
bool geofence_enabled() const; bool sys_status_enabled() const;
bool geofence_failed() const; bool sys_status_failed() const;
private: private: