diff --git a/ArduCopter/ArduCopter.cpp b/ArduCopter/ArduCopter.cpp index 87378ad40e..8ebf84ccbb 100644 --- a/ArduCopter/ArduCopter.cpp +++ b/ArduCopter/ArduCopter.cpp @@ -349,7 +349,9 @@ void Copter::ten_hz_logging_loop() } if (should_log(MASK_LOG_CTUN)) { attitude_control->control_monitor_log(); - Log_Write_Proximity(); +#if PROXIMITY_ENABLED == ENABLED + DataFlash.Log_Write_Proximity(g2.proximity); // Write proximity sensor distances +#endif #if BEACON_ENABLED == ENABLED if (g2.beacon.enabled()) { DataFlash.Log_Write_Beacon(g2.beacon); diff --git a/ArduCopter/Copter.h b/ArduCopter/Copter.h index 00b6cead10..c0c78e24a4 100644 --- a/ArduCopter/Copter.h +++ b/ArduCopter/Copter.h @@ -804,7 +804,6 @@ private: void Log_Write_Precland(); void Log_Write_GuidedTarget(uint8_t target_type, const Vector3f& pos_target, const Vector3f& vel_target); void Log_Write_Throw(ThrowModeStage stage, float velocity, float velocity_z, float accel, float ef_accel_z, bool throw_detect, bool attitude_ok, bool height_ok, bool position_ok); - void Log_Write_Proximity(); void Log_Write_Vehicle_Startup_Messages(); void log_init(void); diff --git a/ArduCopter/Log.cpp b/ArduCopter/Log.cpp index 3d01ffab0f..94b0d77982 100644 --- a/ArduCopter/Log.cpp +++ b/ArduCopter/Log.cpp @@ -571,13 +571,6 @@ void Copter::Log_Write_Throw(ThrowModeStage stage, float velocity, float velocit DataFlash.WriteBlock(&pkt, sizeof(pkt)); } -// Write proximity sensor distances -void Copter::Log_Write_Proximity() -{ -#if PROXIMITY_ENABLED == ENABLED - DataFlash.Log_Write_Proximity(g2.proximity); -#endif -} // type and unit information can be found in // libraries/DataFlash/Logstructure.h; search for "log_Units" for