Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-23 16:23:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Compass: fixed naming of QMC5883L driver

Browse Source 
needed for probe using COMPASS macro in hwdef.dat
This commit is contained in:
Andrew Tridgell 2019-09-02 08:16:12 +10:00
parent 316e7cf7e6
commit 2a48241ebb
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/AP_Compass/AP_Compass.cpp
View File

@ -636,16 +636,19 @@ void Compass::_probe_external_i2c_compasses(void)
//external i2c bus //external i2c bus
FOREACH_I2C_EXTERNAL(i) { FOREACH_I2C_EXTERNAL(i) {
ADD_BACKEND(DRIVER_QMC5883, AP_Compass_QMC5883L::probe(GET_I2C_DEVICE(i, HAL_COMPASS_QMC5883L_I2C_ADDR), ADD_BACKEND(DRIVER_QMC5883L, AP_Compass_QMC5883L::probe(GET_I2C_DEVICE(i, HAL_COMPASS_QMC5883L_I2C_ADDR),
true, HAL_COMPASS_QMC5883L_ORIENTATION_EXTERNAL)); true, HAL_COMPASS_QMC5883L_ORIENTATION_EXTERNAL));
} }
//internal i2c bus // internal i2c bus
if (all_external) {
// only probe QMC5883L on internal if we are treating internals as externals
FOREACH_I2C_INTERNAL(i) { FOREACH_I2C_INTERNAL(i) {
ADD_BACKEND(DRIVER_QMC5883, AP_Compass_QMC5883L::probe(GET_I2C_DEVICE(i, HAL_COMPASS_QMC5883L_I2C_ADDR), ADD_BACKEND(DRIVER_QMC5883L, AP_Compass_QMC5883L::probe(GET_I2C_DEVICE(i, HAL_COMPASS_QMC5883L_I2C_ADDR),
all_external, all_external,
all_external?HAL_COMPASS_QMC5883L_ORIENTATION_EXTERNAL:HAL_COMPASS_QMC5883L_ORIENTATION_INTERNAL)); all_external?HAL_COMPASS_QMC5883L_ORIENTATION_EXTERNAL:HAL_COMPASS_QMC5883L_ORIENTATION_INTERNAL));
} }
}
#if !HAL_MINIMIZE_FEATURES #if !HAL_MINIMIZE_FEATURES
// AK09916 on ICM20948 // AK09916 on ICM20948
@ -929,9 +932,9 @@ void Compass::_detect_backends(void)
ADD_BACKEND(DRIVER_IST8310, AP_Compass_IST8310::probe(GET_I2C_DEVICE(HAL_COMPASS_IST8310_I2C_BUS, HAL_COMPASS_IST8310_I2C_ADDR), ADD_BACKEND(DRIVER_IST8310, AP_Compass_IST8310::probe(GET_I2C_DEVICE(HAL_COMPASS_IST8310_I2C_BUS, HAL_COMPASS_IST8310_I2C_ADDR),
true, ROTATION_PITCH_180_YAW_90)); true, ROTATION_PITCH_180_YAW_90));
#elif HAL_COMPASS_DEFAULT == HAL_COMPASS_QMC5883L #elif HAL_COMPASS_DEFAULT == HAL_COMPASS_QMC5883L
ADD_BACKEND(DRIVER_QMC5883, AP_Compass_QMC5883L::probe(GET_I2C_DEVICE(1, HAL_COMPASS_QMC5883L_I2C_ADDR), ADD_BACKEND(DRIVER_QMC5883L, AP_Compass_QMC5883L::probe(GET_I2C_DEVICE(1, HAL_COMPASS_QMC5883L_I2C_ADDR),
true, HAL_COMPASS_QMC5883L_ORIENTATION_EXTERNAL)); true, HAL_COMPASS_QMC5883L_ORIENTATION_EXTERNAL));
ADD_BACKEND(DRIVER_QMC5883, AP_Compass_QMC5883L::probe(GET_I2C_DEVICE(0, HAL_COMPASS_QMC5883L_I2C_ADDR), ADD_BACKEND(DRIVER_QMC5883L, AP_Compass_QMC5883L::probe(GET_I2C_DEVICE(0, HAL_COMPASS_QMC5883L_I2C_ADDR),
false, HAL_COMPASS_QMC5883L_ORIENTATION_INTERNAL)); false, HAL_COMPASS_QMC5883L_ORIENTATION_INTERNAL));
#elif HAL_COMPASS_DEFAULT == HAL_COMPASS_LIS3MDL_I2C #elif HAL_COMPASS_DEFAULT == HAL_COMPASS_LIS3MDL_I2C
FOREACH_I2C(i) { FOREACH_I2C(i) {

2
libraries/AP_Compass/AP_Compass.h
View File

@ -370,7 +370,7 @@ private:
DRIVER_ICM20948 =8, DRIVER_ICM20948 =8,
DRIVER_MMC3416 =9, DRIVER_MMC3416 =9,
DRIVER_UAVCAN =11, DRIVER_UAVCAN =11,
DRIVER_QMC5883 =12, DRIVER_QMC5883L =12,
DRIVER_SITL =13, DRIVER_SITL =13,
DRIVER_MAG3110 =14, DRIVER_MAG3110 =14,
DRIVER_IST8308 = 15, DRIVER_IST8308 = 15,