Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Copter: fix build for lack of AC_TERRAIN define

This commit is contained in:
Peter Barker 2021-07-12 20:25:30 +10:00 committed by Peter Barker
parent 8234fd4c39
commit 5f039ba06d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduCopter/Parameters.cpp
View File

@ -1079,7 +1079,7 @@ const AP_Param::GroupInfo ParametersG2::var_info[] = {
AP_GROUPINFO("GUID_TIMEOUT", 46, ParametersG2, guided_timeout, 3.0),
#endif
#if AP_TERRAIN_AVAILABLE && AC_TERRAIN
#if AP_TERRAIN_AVAILABLE
// @Param: TERRAIN_MARGIN
// @DisplayName: Terrain following altitude margin
// @Description: Terrain following altitude margin. Vehicle will stop if distance from target altitude is larger than this margin (in meters)

2
ArduCopter/Parameters.h
View File

@ -653,7 +653,7 @@ public:
AP_Float guided_timeout;
#endif
#if AP_TERRAIN_AVAILABLE && AC_TERRAIN
#if AP_TERRAIN_AVAILABLE
AP_Float terrain_margin;
#endif
};

2
ArduCopter/terrain.cpp
View File

@ -30,7 +30,7 @@ void Copter::terrain_logging()
// return terrain following altitude margin. Vehicle will stop if distance from target altitude is larger than this margin (in meters)
float Copter::get_terrain_margin() const
{
#if AP_TERRAIN_AVAILABLE && AC_TERRAIN
#if AP_TERRAIN_AVAILABLE
return MAX(g2.terrain_margin.get(), 0.1);
#else
return 10;