From 0862ec445f3acc01cb1dba75b4fa3310d4f3d2b0 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Wed, 19 Feb 2025 13:39:13 +1100 Subject: [PATCH] SITL: sort i2c include list will reduce conflicts on various branches if we keep these sorted --- libraries/SITL/SIM_I2C.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libraries/SITL/SIM_I2C.cpp b/libraries/SITL/SIM_I2C.cpp index 2b5c6af0570..c1e3468f6e7 100644 --- a/libraries/SITL/SIM_I2C.cpp +++ b/libraries/SITL/SIM_I2C.cpp @@ -21,24 +21,24 @@ #include #include -#include "SIM_I2C.h" -#include "SIM_ToshibaLED.h" -#include "SIM_MaxSonarI2CXL.h" +#include "SIM_Airspeed_DLVR.h" #include "SIM_BattMonitor_SMBus_Generic.h" #include "SIM_BattMonitor_SMBus_Maxell.h" #include "SIM_BattMonitor_SMBus_Rotoye.h" -#include "SIM_Airspeed_DLVR.h" -#include "SIM_Temperature_TSYS01.h" -#include "SIM_Temperature_TSYS03.h" -#include "SIM_Temperature_MCP9600.h" +#include "SIM_I2C.h" #include "SIM_ICM40609.h" +#include "SIM_INA3221.h" #include "SIM_IS31FL3195.h" -#include "SIM_LP5562.h" #include "SIM_LM2755.h" +#include "SIM_LP5562.h" +#include "SIM_MaxSonarI2CXL.h" #include "SIM_MS5525.h" #include "SIM_MS5611.h" #include "SIM_QMC5883L.h" -#include "SIM_INA3221.h" +#include "SIM_Temperature_MCP9600.h" +#include "SIM_Temperature_TSYS01.h" +#include "SIM_Temperature_TSYS03.h" +#include "SIM_ToshibaLED.h" #include