aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

global: use static method to construct AP_Terrain

Browse Source
This commit is contained in:
Lucas De Marchi 2017-08-29 17:02:35 -07:00 committed by Francisco Ferreira
parent 122f3d110b
commit cf6ea9642e
5 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ArduCopter/Copter.cpp
View File

@ -66,9 +66,6 @@ Copter::Copter(void)
mainLoop_count(0), mainLoop_count(0),
rtl_loiter_start_time(0), rtl_loiter_start_time(0),
auto_trim_counter(0), auto_trim_counter(0),
#if AP_TERRAIN_AVAILABLE && AC_TERRAIN
terrain(ahrs, mission, rally),
#endif
#if PRECISION_LANDING == ENABLED #if PRECISION_LANDING == ENABLED
precland(ahrs, inertial_nav), precland(ahrs, inertial_nav),
#endif #endif

2
ArduCopter/Copter.h
View File

@ -584,7 +584,7 @@ private:
// terrain handling // terrain handling
#if AP_TERRAIN_AVAILABLE && AC_TERRAIN #if AP_TERRAIN_AVAILABLE && AC_TERRAIN
AP_Terrain terrain; AP_Terrain terrain = AP_Terrain::create(ahrs, mission, rally);
#endif #endif
// Precision Landing // Precision Landing

2
ArduPlane/Plane.h
View File

@ -611,7 +611,7 @@ private:
// terrain handling // terrain handling
#if AP_TERRAIN_AVAILABLE #if AP_TERRAIN_AVAILABLE
AP_Terrain terrain {ahrs, mission, rally}; AP_Terrain terrain = AP_Terrain::create(ahrs, mission, rally);
#endif #endif
AP_Landing landing {mission,ahrs,SpdHgt_Controller,nav_controller,aparm, AP_Landing landing {mission,ahrs,SpdHgt_Controller,nav_controller,aparm,

3
ArduSub/Sub.cpp
View File

@ -56,9 +56,6 @@ Sub::Sub(void)
pmTest1(0), pmTest1(0),
fast_loopTimer(0), fast_loopTimer(0),
mainLoop_count(0), mainLoop_count(0),
#if AP_TERRAIN_AVAILABLE && AC_TERRAIN
terrain(ahrs, mission, rally),
#endif
in_mavlink_delay(false), in_mavlink_delay(false),
param_loader(var_info), param_loader(var_info),
last_pilot_yaw_input_ms(0) last_pilot_yaw_input_ms(0)

2
ArduSub/Sub.h
View File

@ -436,7 +436,7 @@ private:
// terrain handling // terrain handling
#if AP_TERRAIN_AVAILABLE && AC_TERRAIN #if AP_TERRAIN_AVAILABLE && AC_TERRAIN
AP_Terrain terrain; AP_Terrain terrain = AP_Terrain::create(ahrs, mission, rally);
#endif #endif
// use this to prevent recursion during sensor init // use this to prevent recursion during sensor init