SITL: correct compilation for SimOnHardware

libraries/SITL/SIM_PS_RPLidar.h

@@ -45,14 +45,12 @@ rc 2 1450
 
 #pragma once
 
-#include "SIM_SerialProximitySensor.h"
-
-#ifndef HAL_SIM_PS_RPLIDARA2_ENABLED
-#define HAL_SIM_PS_RPLIDARA2_ENABLED HAL_SIM_SERIALPROXIMITYSENSOR_ENABLED
-#endif
+#include "SIM_config.h"
 
 #if HAL_SIM_PS_RPLIDARA2_ENABLED || HAL_SIM_PS_RPLIDARA1_ENABLED
 
+#include "SIM_SerialProximitySensor.h"
+
 #include <stdio.h>
 
 namespace SITL {

libraries/SITL/SIM_PS_RPLidarA1.h

@@ -43,13 +43,12 @@ rc 2 1450
 
 #pragma once
 
-#include "SIM_PS_RPLidar.h"
-
-#ifndef HAL_SIM_PS_RPLIDARA1_ENABLED
-#define HAL_SIM_PS_RPLIDARA1_ENABLED HAL_SIM_SERIALPROXIMITYSENSOR_ENABLED
-#endif
+#include "SIM_config.h"
 
 #if HAL_SIM_PS_RPLIDARA1_ENABLED
+
+#include "SIM_PS_RPLidar.h"
+
 namespace SITL {
 
 class PS_RPLidarA1 : public PS_RPLidar {

libraries/SITL/SIM_PS_RPLidarA2.h

@@ -43,6 +43,10 @@ rc 2 1450
 
 #pragma once
 
+#include "SIM_config.h"
+
+#if HAL_SIM_PS_RPLIDARA2_ENABLED
+
 #include "SIM_PS_RPLidar.h"
 
 namespace SITL {
@@ -54,3 +58,5 @@ public:
 };
 
 }
+
+#endif  // HAL_SIM_PS_RPLIDARA2_ENABLED

libraries/SITL/SIM_SerialProximitySensor.h

@@ -18,11 +18,7 @@
 
 #pragma once
 
-#include <AP_HAL/AP_HAL_Boards.h>
-
-#ifndef HAL_SIM_SERIALPROXIMITYSENSOR_ENABLED
-#define HAL_SIM_SERIALPROXIMITYSENSOR_ENABLED (CONFIG_HAL_BOARD == HAL_BOARD_SITL)
-#endif
+#include "SIM_config.h"
 
 #if HAL_SIM_SERIALPROXIMITYSENSOR_ENABLED
 

libraries/SITL/SIM_config.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <AP_HAL/AP_HAL_Boards.h>
+
+#ifndef HAL_SIM_SERIALPROXIMITYSENSOR_ENABLED
+#define HAL_SIM_SERIALPROXIMITYSENSOR_ENABLED (CONFIG_HAL_BOARD == HAL_BOARD_SITL)
+#endif
+
+#ifndef HAL_SIM_PS_RPLIDARA1_ENABLED
+#define HAL_SIM_PS_RPLIDARA1_ENABLED HAL_SIM_SERIALPROXIMITYSENSOR_ENABLED
+#endif
+
+#ifndef HAL_SIM_PS_RPLIDARA2_ENABLED
+#define HAL_SIM_PS_RPLIDARA2_ENABLED HAL_SIM_SERIALPROXIMITYSENSOR_ENABLED
+#endif