Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_HAL: consolidate AK8963 defines

This commit is contained in:
Andrew Tridgell 2015-02-24 08:27:52 +11:00
parent 0efd3bacea
commit d186b82edc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_HAL/AP_HAL_Boards.h
View File

@ -78,7 +78,7 @@
#define HAL_COMPASS_PX4 2 #define HAL_COMPASS_PX4 2
#define HAL_COMPASS_HIL 3 #define HAL_COMPASS_HIL 3
#define HAL_COMPASS_VRBRAIN 4 #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 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_BOARD_LOG_DIRECTORY "/var/APM/logs"
#define HAL_INS_DEFAULT HAL_INS_MPU9250 #define HAL_INS_DEFAULT HAL_INS_MPU9250
#define HAL_BARO_DEFAULT HAL_BARO_MS5611 #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 #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_ZYNQ
#define HAL_BOARD_LOG_DIRECTORY "/var/APM/logs" #define HAL_BOARD_LOG_DIRECTORY "/var/APM/logs"
#define HAL_BOARD_TERRAIN_DIRECTORY "/var/APM/terrain" #define HAL_BOARD_TERRAIN_DIRECTORY "/var/APM/terrain"
@ -219,7 +219,7 @@
#define HAL_BOARD_TERRAIN_DIRECTORY "/var/APM/terrain" #define HAL_BOARD_TERRAIN_DIRECTORY "/var/APM/terrain"
#define HAL_INS_DEFAULT HAL_INS_MPU9250 #define HAL_INS_DEFAULT HAL_INS_MPU9250
#define HAL_BARO_DEFAULT HAL_BARO_MS5611_SPI #define HAL_BARO_DEFAULT HAL_BARO_MS5611_SPI
#define HAL_COMPASS_DEFAULT HAL_COMPASS_AK8963 #define HAL_COMPASS_DEFAULT HAL_COMPASS_AK8963_MPU9250
#else #else
#error "no Linux board subtype set" #error "no Linux board subtype set"
#endif #endif