From 686fd5b125771872e9a1e9075b2a57e5ea8e1a42 Mon Sep 17 00:00:00 2001 From: Nate Weibley Date: Fri, 2 Sep 2016 11:49:53 -0400 Subject: [PATCH] Convert geofence distance params to float (#5435) --- src/modules/navigator/geofence.cpp | 4 ++-- src/modules/navigator/geofence_params.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/navigator/geofence.cpp b/src/modules/navigator/geofence.cpp index 73839c9ccc..0bee602955 100644 --- a/src/modules/navigator/geofence.cpp +++ b/src/modules/navigator/geofence.cpp @@ -134,8 +134,8 @@ bool Geofence::inside(const struct vehicle_global_position_s &global_position, bool Geofence::inside(double lat, double lon, float altitude) { - int32_t max_horizontal_distance = _param_max_hor_distance.get(); - int32_t max_vertical_distance = _param_max_ver_distance.get(); + float max_horizontal_distance = _param_max_hor_distance.get(); + float max_vertical_distance = _param_max_ver_distance.get(); if (max_horizontal_distance > 0 || max_vertical_distance > 0) { if (_home_pos_set) { diff --git a/src/modules/navigator/geofence_params.c b/src/modules/navigator/geofence_params.c index eb6f36b36e..307523e2f6 100644 --- a/src/modules/navigator/geofence_params.c +++ b/src/modules/navigator/geofence_params.c @@ -114,7 +114,7 @@ PARAM_DEFINE_INT32(GF_COUNT, -1); * @increment 1 * @group Geofence */ -PARAM_DEFINE_INT32(GF_MAX_HOR_DIST, -1); +PARAM_DEFINE_FLOAT(GF_MAX_HOR_DIST, -1); /** * Max vertical distance in meters. @@ -126,4 +126,4 @@ PARAM_DEFINE_INT32(GF_MAX_HOR_DIST, -1); * @increment 1 * @group Geofence */ -PARAM_DEFINE_INT32(GF_MAX_VER_DIST, -1); +PARAM_DEFINE_FLOAT(GF_MAX_VER_DIST, -1);