From e020694c03bcd1e3706c39537376284b107df86d Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 18 Dec 2012 20:04:47 +1100 Subject: [PATCH] SITL: fixed build of apm1/apm2 target --- libraries/AP_HAL_AVR_SITL/RCInput.cpp | 3 +++ libraries/AP_HAL_AVR_SITL/RCInput.h | 3 +++ libraries/AP_HAL_AVR_SITL/RCOutput.cpp | 4 ++++ libraries/AP_HAL_AVR_SITL/RCOutput.h | 3 +++ 4 files changed, 13 insertions(+) diff --git a/libraries/AP_HAL_AVR_SITL/RCInput.cpp b/libraries/AP_HAL_AVR_SITL/RCInput.cpp index b16303a375..6fad9b71bc 100644 --- a/libraries/AP_HAL_AVR_SITL/RCInput.cpp +++ b/libraries/AP_HAL_AVR_SITL/RCInput.cpp @@ -1,3 +1,5 @@ +#include +#if CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL #include "RCInput.h" @@ -50,3 +52,4 @@ void SITLRCInput::clear_overrides() _override[i] = 0; } } +#endif diff --git a/libraries/AP_HAL_AVR_SITL/RCInput.h b/libraries/AP_HAL_AVR_SITL/RCInput.h index b11b2ca1fb..16ee291338 100644 --- a/libraries/AP_HAL_AVR_SITL/RCInput.h +++ b/libraries/AP_HAL_AVR_SITL/RCInput.h @@ -2,6 +2,8 @@ #ifndef __AP_HAL_AVR_SITL_RCINPUT_H__ #define __AP_HAL_AVR_SITL_RCINPUT_H__ +#include +#if CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL #include class AVR_SITL::SITLRCInput : public AP_HAL::RCInput { @@ -24,5 +26,6 @@ private: uint16_t _override[8]; }; +#endif #endif // __AP_HAL_AVR_SITL_RCINPUT_H__ diff --git a/libraries/AP_HAL_AVR_SITL/RCOutput.cpp b/libraries/AP_HAL_AVR_SITL/RCOutput.cpp index 6d7c215da2..784605773c 100644 --- a/libraries/AP_HAL_AVR_SITL/RCOutput.cpp +++ b/libraries/AP_HAL_AVR_SITL/RCOutput.cpp @@ -1,3 +1,5 @@ +#include +#if CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL #include "RCOutput.h" @@ -43,3 +45,5 @@ void SITLRCOutput::read(uint16_t* period_us, uint8_t len) { memcpy(period_us, _sitlState->pwm_output, len*sizeof(uint16_t)); } + +#endif diff --git a/libraries/AP_HAL_AVR_SITL/RCOutput.h b/libraries/AP_HAL_AVR_SITL/RCOutput.h index 6173bb8c35..7241ece63d 100644 --- a/libraries/AP_HAL_AVR_SITL/RCOutput.h +++ b/libraries/AP_HAL_AVR_SITL/RCOutput.h @@ -2,6 +2,8 @@ #ifndef __AP_HAL_AVR_SITL_RCOUTPUT_H__ #define __AP_HAL_AVR_SITL_RCOUTPUT_H__ +#include +#if CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL #include class AVR_SITL::SITLRCOutput : public AP_HAL::RCOutput { @@ -27,5 +29,6 @@ private: uint16_t _freq_hz; }; +#endif #endif // __AP_HAL_AVR_SITL_RCOUTPUT_H__