Copter: simplify Log_Write_Proximity

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);

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);
 

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