fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-22 00:53:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Parameter update - Rename variables in modules/navigator

Browse Source 
using parameter_update.py script
This commit is contained in:
bresch
2019-04-03 15:38:50 +02:00
committed by Matthias Grob
parent e575f032e4
commit f3990c84fc
18 changed files with 116 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/navigator/geofence.cpp
+5 -5
View File
@@ -224,8 +224,8 @@ bool Geofence::checkAll(double lat, double lon, float altitude)
if (isHomeRequired() && _navigator->home_position_valid()) {
const float max_horizontal_distance = _param_max_hor_distance.get();
const float max_vertical_distance = _param_max_ver_distance.get();
const float max_horizontal_distance = _param_gf_max_hor_dist.get();
const float max_vertical_distance = _param_gf_max_ver_dist.get();
const double home_lat = _navigator->get_home_position()->lat;
const double home_lon = _navigator->get_home_position()->lon;
@@ -268,7 +268,7 @@ bool Geofence::checkAll(double lat, double lon, float altitude)
} else {
_outside_counter++;
if (_outside_counter > _param_counter_threshold.get()) {
if (_outside_counter > _param_gf_count.get()) {
return inside_fence;
} else {
@@ -568,8 +568,8 @@ int Geofence::clearDm()
bool Geofence::isHomeRequired()
{
bool max_horizontal_enabled = (_param_max_hor_distance.get() > FLT_EPSILON);
bool max_vertical_enabled = (_param_max_ver_distance.get() > FLT_EPSILON);
bool max_horizontal_enabled = (_param_gf_max_hor_dist.get() > FLT_EPSILON);
bool max_vertical_enabled = (_param_gf_max_ver_dist.get() > FLT_EPSILON);
bool geofence_action_rtl = (getGeofenceAction() == geofence_result_s::GF_ACTION_RTL);
return max_horizontal_enabled || max_vertical_enabled || geofence_action_rtl;