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

SITL: correct compilation for SimOnHardware

This commit is contained in:
Peter Barker 2023-05-22 13:04:36 +10:00 committed by Peter Barker
parent 6b40fd11d6
commit 34a55166f8
5 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/SITL/SIM_PS_RPLidar.h
View File

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

9
libraries/SITL/SIM_PS_RPLidarA1.h
View File

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

6
libraries/SITL/SIM_PS_RPLidarA2.h
View File

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

6
libraries/SITL/SIM_SerialProximitySensor.h
View File

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

15
libraries/SITL/SIM_config.h Normal file
View File

@ -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