From d186b82edcd56e479062e714ed4acccbeb6705a4 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 24 Feb 2015 08:27:52 +1100 Subject: [PATCH] AP_HAL: consolidate AK8963 defines --- libraries/AP_HAL/AP_HAL_Boards.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/AP_HAL/AP_HAL_Boards.h b/libraries/AP_HAL/AP_HAL_Boards.h index 97f7ab9e65..f641c444b5 100644 --- a/libraries/AP_HAL/AP_HAL_Boards.h +++ b/libraries/AP_HAL/AP_HAL_Boards.h @@ -78,7 +78,7 @@ #define HAL_COMPASS_PX4 2 #define HAL_COMPASS_HIL 3 #define HAL_COMPASS_VRBRAIN 4 -#define HAL_COMPASS_AK8963 5 +#define HAL_COMPASS_AK8963_MPU9250 5 /** CPU classes, used to select if CPU intensive algorithms should be used @@ -206,7 +206,7 @@ #define HAL_BOARD_LOG_DIRECTORY "/var/APM/logs" #define HAL_INS_DEFAULT HAL_INS_MPU9250 #define HAL_BARO_DEFAULT HAL_BARO_MS5611 -#define HAL_COMPASS_DEFAULT HAL_COMPASS_AK8963 +#define HAL_COMPASS_DEFAULT HAL_COMPASS_AK8963_MPU9250 #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_ZYNQ #define HAL_BOARD_LOG_DIRECTORY "/var/APM/logs" #define HAL_BOARD_TERRAIN_DIRECTORY "/var/APM/terrain" @@ -219,7 +219,7 @@ #define HAL_BOARD_TERRAIN_DIRECTORY "/var/APM/terrain" #define HAL_INS_DEFAULT HAL_INS_MPU9250 #define HAL_BARO_DEFAULT HAL_BARO_MS5611_SPI -#define HAL_COMPASS_DEFAULT HAL_COMPASS_AK8963 +#define HAL_COMPASS_DEFAULT HAL_COMPASS_AK8963_MPU9250 #else #error "no Linux board subtype set" #endif