From e9a2b3f2601942ab27575fad4ef3b563fba76f91 Mon Sep 17 00:00:00 2001 From: bresch Date: Wed, 6 Apr 2022 14:59:13 +0200 Subject: [PATCH] geofence: remove unused function parameters --- src/modules/navigator/geofence.cpp | 3 +-- src/modules/navigator/geofence.h | 3 +-- src/modules/navigator/navigator_main.cpp | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/modules/navigator/geofence.cpp b/src/modules/navigator/geofence.cpp index f0a359f930..968cd48a63 100644 --- a/src/modules/navigator/geofence.cpp +++ b/src/modules/navigator/geofence.cpp @@ -213,8 +213,7 @@ bool Geofence::checkAll(double lat, double lon, float altitude) } } -bool Geofence::check(const vehicle_global_position_s &global_position, const vehicle_gps_position_s &gps_position, - const home_position_s home_pos, bool home_position_set) +bool Geofence::check(const vehicle_global_position_s &global_position, const vehicle_gps_position_s &gps_position) { if (_param_gf_altmode.get() == Geofence::GF_ALT_MODE_WGS84) { if (getSource() == Geofence::GF_SOURCE_GLOBALPOS) { diff --git a/src/modules/navigator/geofence.h b/src/modules/navigator/geofence.h index 9c99313986..2ab449b331 100644 --- a/src/modules/navigator/geofence.h +++ b/src/modules/navigator/geofence.h @@ -88,8 +88,7 @@ public: * * @return true: system is obeying fence, false: system is violating fence */ - bool check(const vehicle_global_position_s &global_position, - const vehicle_gps_position_s &gps_position, const home_position_s home_pos, bool home_position_set); + bool check(const vehicle_global_position_s &global_position, const vehicle_gps_position_s &gps_position); /** * Return whether a mission item obeys the geofence. diff --git a/src/modules/navigator/navigator_main.cpp b/src/modules/navigator/navigator_main.cpp index ce0092f787..1be889b9d8 100644 --- a/src/modules/navigator/navigator_main.cpp +++ b/src/modules/navigator/navigator_main.cpp @@ -1555,8 +1555,7 @@ bool Navigator::geofence_allows_position(const vehicle_global_position_s &pos) (_geofence.getGeofenceAction() != geofence_result_s::GF_ACTION_WARN)) { if (PX4_ISFINITE(pos.lat) && PX4_ISFINITE(pos.lon)) { - return _geofence.check(pos, _gps_pos, _home_pos, - home_position_valid()); + return _geofence.check(pos, _gps_pos); } }