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

AP_Terrain: only include GCS_MAVLink if terrain is enabled

This commit is contained in:
Peter Barker 2022-07-08 17:56:18 +10:00 committed by Andrew Tridgell
parent f0c1673b62
commit 84215ff662
6 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_Terrain/AP_Terrain.cpp
View File

@ -13,17 +13,17 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "AP_Terrain.h"
#if AP_TERRAIN_AVAILABLE
#include <AP_HAL/AP_HAL.h> #include <AP_HAL/AP_HAL.h>
#include <AP_Common/AP_Common.h> #include <AP_Common/AP_Common.h>
#include <AP_Math/AP_Math.h> #include <AP_Math/AP_Math.h>
#include <GCS_MAVLink/GCS_MAVLink.h> #include <GCS_MAVLink/GCS_MAVLink.h>
#include <GCS_MAVLink/GCS.h> #include <GCS_MAVLink/GCS.h>
#include <AP_Logger/AP_Logger.h> #include <AP_Logger/AP_Logger.h>
#include "AP_Terrain.h"
#include <AP_AHRS/AP_AHRS.h> #include <AP_AHRS/AP_AHRS.h>
#if AP_TERRAIN_AVAILABLE
#include <AP_Vehicle/AP_Vehicle_Type.h> #include <AP_Vehicle/AP_Vehicle_Type.h>
#include <AP_Filesystem/AP_Filesystem.h> #include <AP_Filesystem/AP_Filesystem.h>

6
libraries/AP_Terrain/AP_Terrain.h
View File

@ -14,11 +14,8 @@
*/ */
#pragma once #pragma once
#include <AP_Common/AP_Common.h>
#include <AP_HAL/AP_HAL_Boards.h> #include <AP_HAL/AP_HAL_Boards.h>
#include <AP_Common/Location.h>
#include <AP_Filesystem/AP_Filesystem_config.h> #include <AP_Filesystem/AP_Filesystem_config.h>
#include <GCS_MAVLink/GCS_MAVLink.h>
#ifndef AP_TERRAIN_AVAILABLE #ifndef AP_TERRAIN_AVAILABLE
#if HAVE_FILESYSTEM_SUPPORT && defined(HAL_BOARD_TERRAIN_DIRECTORY) #if HAVE_FILESYSTEM_SUPPORT && defined(HAL_BOARD_TERRAIN_DIRECTORY)
@ -30,7 +27,10 @@
#if AP_TERRAIN_AVAILABLE #if AP_TERRAIN_AVAILABLE
#include <AP_Common/AP_Common.h>
#include <AP_Common/Location.h>
#include <AP_Param/AP_Param.h> #include <AP_Param/AP_Param.h>
#include <GCS_MAVLink/GCS_MAVLink.h>
#define TERRAIN_DEBUG 0 #define TERRAIN_DEBUG 0

4
libraries/AP_Terrain/TerrainGCS.cpp
View File

@ -18,6 +18,8 @@
#include "AP_Terrain.h" #include "AP_Terrain.h"
#if AP_TERRAIN_AVAILABLE
#include <AP_AHRS/AP_AHRS.h> #include <AP_AHRS/AP_AHRS.h>
#include <AP_HAL/AP_HAL.h> #include <AP_HAL/AP_HAL.h>
#include <AP_Common/AP_Common.h> #include <AP_Common/AP_Common.h>
@ -25,8 +27,6 @@
#include <GCS_MAVLink/GCS_MAVLink.h> #include <GCS_MAVLink/GCS_MAVLink.h>
#include <GCS_MAVLink/GCS.h> #include <GCS_MAVLink/GCS.h>
#if AP_TERRAIN_AVAILABLE
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>

10
libraries/AP_Terrain/TerrainIO.cpp
View File

@ -16,17 +16,15 @@
handle disk IO for terrain code handle disk IO for terrain code
*/ */
#include <AP_HAL/AP_HAL.h>
#include <AP_Common/AP_Common.h>
#include <AP_Math/AP_Math.h>
#include <GCS_MAVLink/GCS_MAVLink.h>
#include <GCS_MAVLink/GCS.h>
#include <stdio.h>
#include "AP_Terrain.h" #include "AP_Terrain.h"
#if AP_TERRAIN_AVAILABLE #if AP_TERRAIN_AVAILABLE
#include <AP_Filesystem/AP_Filesystem.h> #include <AP_Filesystem/AP_Filesystem.h>
#include <AP_HAL/AP_HAL.h>
#include <AP_Common/AP_Common.h>
#include <AP_Math/AP_Math.h>
#include <stdio.h>
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;

9
libraries/AP_Terrain/TerrainMission.cpp
View File

@ -16,18 +16,17 @@
handle checking mission points for terrain data handle checking mission points for terrain data
*/ */
#include "AP_Terrain.h"
#if AP_TERRAIN_AVAILABLE
#include <AP_HAL/AP_HAL.h> #include <AP_HAL/AP_HAL.h>
#include <AP_Common/AP_Common.h> #include <AP_Common/AP_Common.h>
#include <AP_Math/AP_Math.h> #include <AP_Math/AP_Math.h>
#include <AP_Mission/AP_Mission.h> #include <AP_Mission/AP_Mission.h>
#include <AP_Rally/AP_Rally.h> #include <AP_Rally/AP_Rally.h>
#include <GCS_MAVLink/GCS_MAVLink.h>
#include <GCS_MAVLink/GCS.h>
#include "AP_Terrain.h"
#include <AP_GPS/AP_GPS.h> #include <AP_GPS/AP_GPS.h>
#if AP_TERRAIN_AVAILABLE
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;
/* /*

9
libraries/AP_Terrain/TerrainUtil.cpp
View File

@ -16,16 +16,13 @@
handle disk IO for terrain code handle disk IO for terrain code
*/ */
#include <AP_HAL/AP_HAL.h>
#include <AP_Common/AP_Common.h>
#include <AP_Math/AP_Math.h>
#include <GCS_MAVLink/GCS_MAVLink.h>
#include <GCS_MAVLink/GCS.h>
#include "AP_Terrain.h" #include "AP_Terrain.h"
#if AP_TERRAIN_AVAILABLE #if AP_TERRAIN_AVAILABLE
#include <AP_Filesystem/AP_Filesystem.h> #include <AP_HAL/AP_HAL.h>
#include <AP_Common/AP_Common.h>
#include <AP_Math/AP_Math.h>
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;