Browse Source

Plane: use have_ekf_logging()

master
Andrew Tridgell 9 years ago
parent
commit
3bbc6353d8
  1. 2
      ArduPlane/ArduPlane.cpp
  2. 8
      ArduPlane/Log.cpp

2
ArduPlane/ArduPlane.cpp

@ -226,7 +226,7 @@ void Plane::update_compass(void) @@ -226,7 +226,7 @@ void Plane::update_compass(void)
if (g.compass_enabled && compass.read()) {
ahrs.set_compass(&compass);
compass.learn_offsets();
if (should_log(MASK_LOG_COMPASS)) {
if (should_log(MASK_LOG_COMPASS) && !ahrs.have_ekf_logging()) {
DataFlash.Log_Write_Compass(compass);
}
} else {

8
ArduPlane/Log.cpp

@ -435,7 +435,9 @@ void Plane::Log_Arm_Disarm() { @@ -435,7 +435,9 @@ void Plane::Log_Arm_Disarm() {
void Plane::Log_Write_GPS(uint8_t instance)
{
DataFlash.Log_Write_GPS(gps, instance, current_loc.alt - ahrs.get_home().alt);
if (!ahrs.have_ekf_logging()) {
DataFlash.Log_Write_GPS(gps, instance);
}
}
void Plane::Log_Write_IMU()
@ -454,7 +456,9 @@ void Plane::Log_Write_RC(void) @@ -454,7 +456,9 @@ void Plane::Log_Write_RC(void)
void Plane::Log_Write_Baro(void)
{
DataFlash.Log_Write_Baro(barometer);
if (!ahrs.have_ekf_logging()) {
DataFlash.Log_Write_Baro(barometer);
}
}
// Write a AIRSPEED packet

Loading…
Cancel
Save