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

SITL: split AP_HAL_SITL and AP_SIM_ENABLED

This commit is contained in:
Peter Barker 2021-10-11 12:12:20 +11:00 committed by Peter Barker
parent 0957131543
commit 2e809282e7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/SITL/SIM_GPS.h
View File

@ -26,7 +26,7 @@ param set SERIAL5_PROTOCOL 5
#include <AP_HAL/AP_HAL_Boards.h>
#ifndef HAL_SIM_GPS_ENABLED
#define HAL_SIM_GPS_ENABLED (CONFIG_HAL_BOARD == HAL_BOARD_SITL && !defined(HAL_BUILD_AP_PERIPH))
#define HAL_SIM_GPS_ENABLED (AP_SIM_ENABLED && !defined(HAL_BUILD_AP_PERIPH))
#endif
#if HAL_SIM_GPS_ENABLED

6
libraries/SITL/SITL.cpp
View File

@ -19,11 +19,11 @@
#include "SITL.h"
#if AP_SIM_ENABLED
#include <AP_Common/AP_Common.h>
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
#include <GCS_MAVLink/GCS_MAVLink.h>
#include <AP_Logger/AP_Logger.h>
#include <AP_InertialSensor/AP_InertialSensor.h>
@ -659,4 +659,4 @@ SITL::SIM *sitl()
};
#endif // CONFIG_HAL_BOARD
#endif // AP_SIM_ENABLED

4
libraries/SITL/SITL.h
View File

@ -2,7 +2,7 @@
#include <AP_HAL/AP_HAL_Boards.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
#if AP_SIM_ENABLED
#include <AP_Math/AP_Math.h>
#include <GCS_MAVLink/GCS_MAVLink.h>
@ -486,4 +486,4 @@ namespace AP {
SITL::SIM *sitl();
};
#endif // CONFIG_HAL_BOARD
#endif // AP_SIM_ENABLED