AP_NavEKF2: Don't use geomag data when user specifies declination

This commit is contained in:
Paul Riseborough 2020-04-26 08:12:02 +10:00 committed by Randy Mackay
parent db90cf5fb0
commit 117b2629a9

View File

@ -578,7 +578,7 @@ void NavEKF2_core::readGpsData()
if (gpsGoodToAlign && !have_table_earth_field) {
const Compass *compass = _ahrs->get_compass();
if (compass && compass->have_scale_factor(magSelectIndex)) {
if (compass && compass->have_scale_factor(magSelectIndex) && compass->auto_declination_enabled()) {
table_earth_field_ga = AP_Declination::get_earth_field_ga(gpsloc);
table_declination = radians(AP_Declination::get_declination(gpsloc.lat*1.0e-7,
gpsloc.lng*1.0e-7));