Browse Source

Tracker: move automatic declination setting into AP_Compass itself

mission-4.1.18
Peter Barker 6 years ago committed by Andrew Tridgell
parent
commit
2428487383
  1. 3
      AntennaTracker/AntennaTracker.cpp
  2. 1
      AntennaTracker/Tracker.h
  3. 20
      AntennaTracker/sensors.cpp

3
AntennaTracker/AntennaTracker.cpp

@ -97,9 +97,6 @@ void Tracker::one_second_loop() @@ -97,9 +97,6 @@ void Tracker::one_second_loop()
// updated armed/disarmed status LEDs
update_armed_disarmed();
// init compass location for declination
init_compass_location();
if (!ahrs.home_is_set()) {
// set home to current location
Location temp_loc;

1
AntennaTracker/Tracker.h

@ -248,7 +248,6 @@ private: @@ -248,7 +248,6 @@ private:
// sensors.cpp
void update_ahrs();
void compass_save();
void init_compass_location();
void update_compass(void);
void accel_cal_update(void);
void update_GPS(void);

20
AntennaTracker/sensors.cpp

@ -8,21 +8,6 @@ void Tracker::update_ahrs() @@ -8,21 +8,6 @@ void Tracker::update_ahrs()
ahrs.update();
}
/*
initialise compass's location used for declination
*/
void Tracker::init_compass_location(void)
{
// update initial location used for declination
if (!compass_init_location) {
Location loc;
if (ahrs.get_position(loc)) {
compass.set_initial_location(loc.lat, loc.lng);
compass_init_location = true;
}
}
}
/*
read and update compass
*/
@ -85,11 +70,6 @@ void Tracker::update_GPS(void) @@ -85,11 +70,6 @@ void Tracker::update_GPS(void)
if (!set_home(current_loc)) {
// silently ignored
}
if (AP::compass().enabled()) {
// Set compass declination automatically
compass.set_initial_location(gps.location().lat, gps.location().lng);
}
ground_start_count = 0;
}
}

Loading…
Cancel
Save