SITL: follow standard pattern for including ENABLED guards

Signed-off-by: Rhys Mainwaring <[email protected]>
rmackay9 · Dec 15, 2024 · ee7376a · ee7376a
1 parent 5b935a3
commit ee7376a
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 7 deletions.
diff --git a/libraries/SITL/SIM_Airspeed_DLVR.cpp b/libraries/SITL/SIM_Airspeed_DLVR.cpp
@@ -1,7 +1,9 @@
-#include "SIM_Airspeed_DLVR.h"
+#include "SIM_config.h"
 
 #if AP_SIM_AIRSPEED_DLVR_ENABLED
 
+#include "SIM_Airspeed_DLVR.h"
+
 #include "SITL.h"
 
 int SITL::Airspeed_DLVR::rdwr(I2C::i2c_rdwr_ioctl_data *&data)

diff --git a/libraries/SITL/SIM_BattMonitor_SMBus_Maxell.cpp b/libraries/SITL/SIM_BattMonitor_SMBus_Maxell.cpp
@@ -1,7 +1,9 @@
-#include "SIM_BattMonitor_SMBus_Maxell.h"
+#include "SIM_config.h"
 
 #if AP_SIM_BATT_MONITOR_SMBUS_MAXELL_ENABLED
 
+#include "SIM_BattMonitor_SMBus_Maxell.h"
+
 SITL::Maxell::Maxell() :
     SIM_BattMonitor_SMBus_Generic()
 {

diff --git a/libraries/SITL/SIM_BattMonitor_SMBus_Rotoye.cpp b/libraries/SITL/SIM_BattMonitor_SMBus_Rotoye.cpp
@@ -1,7 +1,9 @@
-#include "SIM_BattMonitor_SMBus_Rotoye.h"
+#include "SIM_config.h"
 
 #if AP_SIM_BATT_MONITOR_SMBUS_ROTOYE_ENABLED
 
+#include "SIM_BattMonitor_SMBus_Rotoye.h"
+
 #include <AP_HAL/utility/sparse-endian.h>
 
 SITL::Rotoye::Rotoye() :

diff --git a/libraries/SITL/SIM_MS5525.cpp b/libraries/SITL/SIM_MS5525.cpp
@@ -1,7 +1,9 @@
-#include "SIM_MS5525.h"
+#include "SIM_config.h"
 
 #if AP_SIM_MS5525_ENABLED
 
+#include "SIM_MS5525.h"
+
 #include <SITL/SITL.h>
 
 using namespace SITL;

diff --git a/libraries/SITL/SIM_MS5611.cpp b/libraries/SITL/SIM_MS5611.cpp
@@ -1,7 +1,9 @@
-#include "SIM_MS5611.h"
+#include "SIM_config.h"
 
 #if AP_SIM_MS5611_ENABLED
 
+#include "SIM_MS5611.h"
+
 #include <SITL/SITL.h>
 
 #include <stdio.h>

diff --git a/libraries/SITL/SIM_Temperature_MCP9600.cpp b/libraries/SITL/SIM_Temperature_MCP9600.cpp
@@ -1,7 +1,9 @@
-#include "SIM_Temperature_MCP9600.h"
+#include "SIM_config.h"
 
 #if AP_SIM_TEMPERATURE_MCP9600_ENABLED
 
+#include "SIM_Temperature_MCP9600.h"
+
 using namespace SITL;
 
 #include <GCS_MAVLink/GCS.h>

diff --git a/libraries/SITL/SIM_Temperature_TSYS01.cpp b/libraries/SITL/SIM_Temperature_TSYS01.cpp
@@ -1,7 +1,9 @@
-#include "SIM_Temperature_TSYS01.h"
+#include "SIM_config.h"
 
 #if AP_SIM_TEMPERATURE_TSYS01_ENABLED
 
+#include "SIM_Temperature_TSYS01.h"
+
 #include <stdio.h>
 
 constexpr const int32_t SITL::TSYS01::_k[5];