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

Tracker: fixed calibration bug

This commit is contained in:
stefanlynka 2016-06-03 09:56:58 +09:00 committed by Randy Mackay
parent 5df2e57209
commit 0c06e62bce
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AntennaTracker/system.cpp
View File

@ -112,8 +112,6 @@ void Tracker::init_tracker()
prepare_servos();
}
// calibrate pressure on startup by default
nav_status.need_altitude_calibration = true;
}
// updates the status of the notify objects

16
AntennaTracker/tracking.cpp
View File

@ -146,16 +146,16 @@ void Tracker::tracking_update_pressure(const mavlink_scaled_pressure_t &msg)
// calculate altitude difference based on difference in barometric pressure
float alt_diff = barometer.get_altitude_difference(local_pressure, aircraft_pressure);
if (!isnan(alt_diff)) {
if (!isnan(alt_diff) && !isinf(alt_diff)) {
nav_status.alt_difference_baro = alt_diff + nav_status.altitude_offset;
}
if (nav_status.need_altitude_calibration) {
// we have done a baro calibration - zero the altitude
// difference to the aircraft
nav_status.altitude_offset = -nav_status.alt_difference_baro;
nav_status.alt_difference_baro = 0;
nav_status.need_altitude_calibration = false;
if (nav_status.need_altitude_calibration) {
// we have done a baro calibration - zero the altitude
// difference to the aircraft
nav_status.altitude_offset = -alt_diff;
nav_status.alt_difference_baro = 0;
nav_status.need_altitude_calibration = false;
}
}
// log altitude difference