aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SITL: no need to use #ifdefs

Browse Source 
Now that SITL is compiled only when it's needed (i.e. using the SITL
board), there's no need to ifdef its files based on the
CONFIG_HAL_BOARD. So remove them.
This commit is contained in:
Caio Marcelo de Oliveira Filho 2015-10-22 13:33:01 -02:00
parent f27f8f2f5d
commit 8a55b26443
12 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/SITL/SIM_Aircraft.cpp
View File

@ -18,7 +18,6 @@
*/
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
#include <AP_Common/AP_Common.h>
#include "SIM_Aircraft.h"
#include <unistd.h>
@ -291,5 +290,3 @@ void Aircraft::set_speedup(float speedup)
}
} // namespace SITL
#endif // CONFIG_HAL_BOARD

3
libraries/SITL/SIM_Balloon.cpp
View File

@ -18,7 +18,6 @@
*/
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
#include "SIM_Balloon.h"
#include <stdio.h>
@ -120,5 +119,3 @@ void Balloon::update(const struct sitl_input &input)
}
} // namespace SITL
#endif // CONFIG_HAL_BOARD

3
libraries/SITL/SIM_CRRCSim.cpp
View File

@ -18,7 +18,6 @@
*/
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
#include "SIM_CRRCSim.h"
#include <stdio.h>
@ -153,5 +152,3 @@ void CRRCSim::update(const struct sitl_input &input)
}
} // namespace SITL
#endif // CONFIG_HAL_BOARD

3
libraries/SITL/SIM_Gazebo.cpp
View File

@ -18,7 +18,6 @@
*/
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
#include "SIM_Gazebo.h"
#include <stdio.h>
@ -128,5 +127,3 @@ void Gazebo::update(const struct sitl_input &input)
}
} // namespace SITL
#endif // CONFIG_HAL_BOARD

3
libraries/SITL/SIM_Gimbal.cpp
View File

@ -18,7 +18,6 @@
*/
#include "SIM_Aircraft.h"
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
#include "SIM_Gimbal.h"
#include <stdio.h>
@ -295,5 +294,3 @@ void Gimbal::send_report(void)
}
} // namespace SITL
#endif // CONFIG_HAL_BOARD

3
libraries/SITL/SIM_Gimbal.h
View File

@ -21,7 +21,6 @@
#define _SIM_GIMBAL_H
#include "SIM_Aircraft.h"
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
#include <AP_HAL/utility/Socket.h>
namespace SITL {
@ -109,6 +108,4 @@ private:
} // namespace SITL
#endif // CONFIG_HAL_BOARD
#endif // _SIM_GIMBAL_H

3
libraries/SITL/SIM_Helicopter.cpp
View File

@ -18,7 +18,6 @@
*/
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
#include "SIM_Helicopter.h"
#include <stdio.h>
@ -210,5 +209,3 @@ void Helicopter::update(const struct sitl_input &input)
}
} // namespace SITL
#endif // CONFIG_HAL_BOARD

3
libraries/SITL/SIM_JSBSim.cpp
View File

@ -18,7 +18,6 @@
*/
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
#include "SIM_JSBSim.h"
#include <stdio.h>
@ -457,5 +456,3 @@ void JSBSim::update(const struct sitl_input &input)
}
} // namespace SITL
#endif // CONFIG_HAL_BOARD

3
libraries/SITL/SIM_Multicopter.cpp
View File

@ -18,7 +18,6 @@
*/
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
#include "SIM_Multicopter.h"
#include <stdio.h>
@ -227,5 +226,3 @@ void MultiCopter::update(const struct sitl_input &input)
}
} // namespace SITL
#endif // CONFIG_HAL_BOARD

3
libraries/SITL/SIM_Rover.cpp
View File

@ -18,7 +18,6 @@
*/
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
#include "SIM_Rover.h"
#include <stdio.h>
#include <string.h>
@ -158,5 +157,3 @@ void SimRover::update(const struct sitl_input &input)
}
} // namespace SITL
#endif // CONFIG_HAL_BOARD

3
libraries/SITL/SIM_Tracker.cpp
View File

@ -18,7 +18,6 @@
*/
#include "SIM_Tracker.h"
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
#include <stdio.h>
namespace SITL {
@ -138,5 +137,3 @@ void Tracker::update(const struct sitl_input &input)
}
} // namespace SITL
#endif

3
libraries/SITL/SIM_last_letter.cpp
View File

@ -18,7 +18,6 @@
*/
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
#include "SIM_last_letter.h"
#include <stdio.h>
#include <sys/types.h>
@ -144,5 +143,3 @@ void last_letter::update(const struct sitl_input &input)
}
} // namespace SITL
#endif // CONFIG_HAL_BOARD