diff --git a/ArduPlane/ArduPlane.cpp b/ArduPlane/ArduPlane.cpp index 264b2416fb..fd538db7c3 100644 --- a/ArduPlane/ArduPlane.cpp +++ b/ArduPlane/ArduPlane.cpp @@ -147,7 +147,7 @@ void Plane::ahrs_update() ahrs.update(); if (should_log(MASK_LOG_IMU)) { - Log_Write_IMU(); + DataFlash.Log_Write_IMU(); } // calculate a scaled roll limit based on current pitch @@ -244,10 +244,10 @@ void Plane::update_logging1(void) } if (should_log(MASK_LOG_ATTITUDE_MED) && !should_log(MASK_LOG_IMU)) - Log_Write_IMU(); + DataFlash.Log_Write_IMU(); if (should_log(MASK_LOG_ATTITUDE_MED)) - Log_Write_AOA_SSA(); + DataFlash.Log_Write_AOA_SSA(ahrs); } /* diff --git a/ArduPlane/Log.cpp b/ArduPlane/Log.cpp index fa0cf0f262..4b244108c6 100644 --- a/ArduPlane/Log.cpp +++ b/ArduPlane/Log.cpp @@ -272,11 +272,6 @@ void Plane::Log_Write_AETR() DataFlash.WriteBlock(&pkt, sizeof(pkt)); } -void Plane::Log_Write_IMU() -{ - DataFlash.Log_Write_IMU(); -} - void Plane::Log_Write_RC(void) { DataFlash.Log_Write_RCIN(); @@ -287,18 +282,6 @@ void Plane::Log_Write_RC(void) Log_Write_AETR(); } -// Write a AIRSPEED packet -void Plane::Log_Write_Airspeed(void) -{ - DataFlash.Log_Write_Airspeed(airspeed); -} - -// Write a AOA and SSA packet -void Plane::Log_Write_AOA_SSA(void) -{ - DataFlash.Log_Write_AOA_SSA(ahrs); -} - // log ahrs home and EKF origin to dataflash void Plane::Log_Write_Home_And_Origin() { @@ -375,7 +358,6 @@ void Plane::log_init(void) #else // LOGGING_ENABLED -void Plane::Log_Write_AOA_SSA(void) {} void Plane::Log_Write_Attitude(void) {} void Plane::Log_Write_Fast(void) {} void Plane::Log_Write_Performance() {} @@ -390,9 +372,7 @@ void Plane::Log_Write_Optflow() {} #endif void Plane::Log_Arm_Disarm() {} -void Plane::Log_Write_IMU() {} void Plane::Log_Write_RC(void) {} -void Plane::Log_Write_Airspeed(void) {} void Plane::Log_Write_Home_And_Origin() {} void Plane::Log_Write_Vehicle_Startup_Messages() {} diff --git a/ArduPlane/Plane.h b/ArduPlane/Plane.h index 4ee45c3307..191fe21ab4 100644 --- a/ArduPlane/Plane.h +++ b/ArduPlane/Plane.h @@ -800,9 +800,7 @@ private: void Log_Write_Sonar(); void Log_Write_Optflow(); void Log_Arm_Disarm(); - void Log_Write_IMU(); void Log_Write_RC(void); - void Log_Write_Airspeed(void); void Log_Write_Home_And_Origin(); void Log_Write_Vehicle_Startup_Messages(); void Log_Write_AOA_SSA(); diff --git a/ArduPlane/sensors.cpp b/ArduPlane/sensors.cpp index fff787a21a..0e4a82b83a 100644 --- a/ArduPlane/sensors.cpp +++ b/ArduPlane/sensors.cpp @@ -73,7 +73,7 @@ void Plane::read_airspeed(void) if (airspeed.enabled()) { airspeed.read(); if (should_log(MASK_LOG_IMU)) { - Log_Write_Airspeed(); + DataFlash.Log_Write_Airspeed(airspeed); } // supply a new temperature to the barometer from the digital