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

Plane: stop setting terrain singleton; libraries use singleton

This commit is contained in:
Peter Barker 2021-05-05 21:25:46 +10:00 committed by Andrew Tridgell
parent 05a0205c21
commit 93323f1f39
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ArduPlane/quadplane.cpp
View File

@ -790,9 +790,6 @@ bool QuadPlane::setup(void)
AP_BoardConfig::config_error("Unable to allocate %s", "wp_nav"); AP_BoardConfig::config_error("Unable to allocate %s", "wp_nav");
} }
AP_Param::load_object_from_eeprom(wp_nav, wp_nav->var_info); AP_Param::load_object_from_eeprom(wp_nav, wp_nav->var_info);
#if AP_TERRAIN_AVAILABLE
wp_nav->set_terrain(&plane.terrain);
#endif
loiter_nav = new AC_Loiter(inertial_nav, *ahrs_view, *pos_control, *attitude_control); loiter_nav = new AC_Loiter(inertial_nav, *ahrs_view, *pos_control, *attitude_control);
if (!loiter_nav) { if (!loiter_nav) {

5
ArduPlane/system.cpp
View File

@ -146,11 +146,6 @@ void Plane::init_ardupilot()
#if AC_FENCE == ENABLED #if AC_FENCE == ENABLED
fence.init(); fence.init();
#endif #endif
#if AP_TERRAIN_AVAILABLE
Location::set_terrain(&terrain);
#endif
} }
//******************************************************************************** //********************************************************************************