Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-24 08:44:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

SITL: do not compile SIM_GPS parameters in if SIM_GPS not enabled

Browse Source
This commit is contained in:
Peter Barker 2021-10-11 12:12:20 +11:00 committed by Peter Barker
parent 90744e08e1
commit 8782e21443
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/SITL/SITL.cpp
View File

@ -79,7 +79,9 @@ const AP_Param::GroupInfo SIM::var_info[] = {
AP_SUBGROUPINFO(shipsim, "SHIP_", 59, SIM, ShipSim),
#endif
AP_SUBGROUPEXTENSION("", 60, SIM, var_mag),
#if HAL_SIM_GPS_ENABLED
AP_SUBGROUPEXTENSION("", 61, SIM, var_gps),
#endif
AP_SUBGROUPEXTENSION("", 62, SIM, var_info3),
AP_SUBGROUPEXTENSION("", 63, SIM, var_info2),
AP_GROUPEND
@ -317,7 +319,8 @@ const AP_Param::GroupInfo SIM::BaroParm::var_info[] = {
AP_GROUPINFO("WCF_LFT", 10, SIM::BaroParm, wcof_yn, 0.0),
AP_GROUPEND
};
#if HAL_SIM_GPS_ENABLED
// GPS SITL parameters
const AP_Param::GroupInfo SIM::var_gps[] = {
AP_GROUPINFO("GPS_DISABLE", 1, SIM, gps_disable[0], 0),
@ -358,6 +361,7 @@ const AP_Param::GroupInfo SIM::var_gps[] = {
AP_GROUPEND
};
#endif // HAL_SIM_GPS_ENABLED
// Mag SITL parameters
const AP_Param::GroupInfo SIM::var_mag[] = {

6
libraries/SITL/SITL.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <AP_HAL/AP_HAL.h>
#include <AP_HAL/AP_HAL_Boards.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
@ -102,7 +102,9 @@ public:
AP_Param::setup_object_defaults(this, var_info);
AP_Param::setup_object_defaults(this, var_info2);
AP_Param::setup_object_defaults(this, var_info3);
#if HAL_SIM_GPS_ENABLED
AP_Param::setup_object_defaults(this, var_gps);
#endif
AP_Param::setup_object_defaults(this, var_mag);
AP_Param::setup_object_defaults(this, var_ins);
#ifdef SFML_JOYSTICK
@ -148,7 +150,9 @@ public:
static const struct AP_Param::GroupInfo var_info[];
static const struct AP_Param::GroupInfo var_info2[];
static const struct AP_Param::GroupInfo var_info3[];
#if HAL_SIM_GPS_ENABLED
static const struct AP_Param::GroupInfo var_gps[];
#endif
static const struct AP_Param::GroupInfo var_mag[];
static const struct AP_Param::GroupInfo var_ins[];
#ifdef SFML_JOYSTICK