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

Plane: use AP_HAL_BOARD_DRIVER

Browse Source
This commit is contained in:
Andrew Tridgell 2012-12-18 20:04:31 +11:00
parent 4cff98dcae
commit 761ab5c3e8
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ArduPlane/ArduPlane.pde
View File

@ -50,7 +50,7 @@
#include <AP_Mount.h> // Camera/Antenna mount #include <AP_Mount.h> // Camera/Antenna mount
#include <AP_Declination.h> // ArduPilot Mega Declination Helper Library #include <AP_Declination.h> // ArduPilot Mega Declination Helper Library
#include <DataFlash.h> #include <DataFlash.h>
#include <SITL.h>
// optional new controller library // optional new controller library
#if APM_CONTROL == ENABLED #if APM_CONTROL == ENABLED
@ -74,17 +74,7 @@
AP_HAL::BetterStream* cliSerial; AP_HAL::BetterStream* cliSerial;
#if CONFIG_HAL_BOARD == HAL_BOARD_APM2 const AP_HAL::HAL& hal = AP_HAL_BOARD_DRIVER;
const AP_HAL::HAL& hal = AP_HAL_AVR_APM2;
#elif CONFIG_HAL_BOARD == HAL_BOARD_APM1
const AP_HAL::HAL& hal = AP_HAL_AVR_APM1;
#elif CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL
const AP_HAL::HAL& hal = AP_HAL_AVR_SITL;
#include <SITL.h>
SITL sitl;
#else
#error "Unknown CONFIG_HAL_BOARD type"
#endif
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -153,6 +143,7 @@ static AP_ADC_ADS7844 adc;
AP_Baro_BMP085_HIL barometer; AP_Baro_BMP085_HIL barometer;
AP_Compass_HIL compass; AP_Compass_HIL compass;
AP_InertialSensor_Stub ins; AP_InertialSensor_Stub ins;
SITL sitl;
#else #else
#if CONFIG_BARO == AP_BARO_BMP085 #if CONFIG_BARO == AP_BARO_BMP085