mirror of https://github.com/ArduPilot/ardupilot
AntennaTracker: Update compass to new interface
This commit is contained in:
parent
033bd243d6
commit
53275ab8af
|
@ -120,19 +120,7 @@ static AP_GPS gps;
|
||||||
|
|
||||||
static AP_Baro barometer;
|
static AP_Baro barometer;
|
||||||
|
|
||||||
#if CONFIG_COMPASS == HAL_COMPASS_PX4
|
static Compass compass;
|
||||||
static AP_Compass_PX4 compass;
|
|
||||||
#elif CONFIG_COMPASS == HAL_COMPASS_VRBRAIN
|
|
||||||
static AP_Compass_VRBRAIN compass;
|
|
||||||
#elif CONFIG_COMPASS == HAL_COMPASS_HMC5843
|
|
||||||
static AP_Compass_HMC5843 compass;
|
|
||||||
#elif CONFIG_COMPASS == HAL_COMPASS_HIL
|
|
||||||
static AP_Compass_HIL compass;
|
|
||||||
#elif CONFIG_COMPASS == HAL_COMPASS_AK8963
|
|
||||||
static AP_Compass_AK8963_MPU9250 compass;
|
|
||||||
#else
|
|
||||||
#error Unrecognized CONFIG_COMPASS setting
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if CONFIG_HAL_BOARD == HAL_BOARD_APM1
|
#if CONFIG_HAL_BOARD == HAL_BOARD_APM1
|
||||||
AP_ADC_ADS7844 apm1_adc;
|
AP_ADC_ADS7844 apm1_adc;
|
||||||
|
|
|
@ -17,9 +17,6 @@
|
||||||
#define ENABLE ENABLED
|
#define ENABLE ENABLED
|
||||||
#define DISABLE DISABLED
|
#define DISABLE DISABLED
|
||||||
|
|
||||||
#define CONFIG_BARO HAL_BARO_DEFAULT
|
|
||||||
#define CONFIG_COMPASS HAL_COMPASS_DEFAULT
|
|
||||||
|
|
||||||
#ifndef MAV_SYSTEM_ID
|
#ifndef MAV_SYSTEM_ID
|
||||||
// use 2 for antenna tracker by default
|
// use 2 for antenna tracker by default
|
||||||
# define MAV_SYSTEM_ID 2
|
# define MAV_SYSTEM_ID 2
|
||||||
|
|
Loading…
Reference in New Issue