From 8b57405143c5545766fd10fbb9cf0b68cc38bf60 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Mon, 19 Jun 2017 09:25:00 +1000
Subject: [PATCH] Copter: handle knowledge of in_log_download in DataFlash

---
 ArduCopter/Copter.h        |  3 ---
 ArduCopter/GCS_Mavlink.cpp | 17 -----------------
 ArduCopter/Log.cpp         |  2 +-
 ArduCopter/system.cpp      |  3 ---
 4 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/ArduCopter/Copter.h b/ArduCopter/Copter.h
index b24efb1479..088059e4f1 100644
--- a/ArduCopter/Copter.h
+++ b/ArduCopter/Copter.h
@@ -182,9 +182,6 @@ private:
     // used to detect MAVLink acks from GCS to stop compassmot
     uint8_t command_ack_counter;
 
-    // has a log download started?
-    bool in_log_download;
-
     // primary input control channels
     RC_Channel *channel_roll;
     RC_Channel *channel_pitch;
diff --git a/ArduCopter/GCS_Mavlink.cpp b/ArduCopter/GCS_Mavlink.cpp
index 2e6b4a95f6..e20d7e8ee4 100644
--- a/ArduCopter/GCS_Mavlink.cpp
+++ b/ArduCopter/GCS_Mavlink.cpp
@@ -1837,23 +1837,6 @@ void GCS_MAVLINK_Copter::handleMessage(mavlink_message_t* msg)
         break;
     }
 
-    case MAVLINK_MSG_ID_LOG_REQUEST_DATA:
-        copter.in_log_download = true;
-        /* no break */
-    case MAVLINK_MSG_ID_LOG_ERASE:
-        /* no break */
-    case MAVLINK_MSG_ID_LOG_REQUEST_LIST:
-        if (!copter.in_mavlink_delay && !copter.motors->armed()) {
-            copter.DataFlash.handle_mavlink_msg(*this, msg);
-        }
-        break;
-    case MAVLINK_MSG_ID_LOG_REQUEST_END:
-        copter.in_log_download = false;
-        if (!copter.in_mavlink_delay && !copter.motors->armed()) {
-            copter.DataFlash.handle_mavlink_msg(*this, msg);
-        }
-        break;
-
     case MAVLINK_MSG_ID_SERIAL_CONTROL:
         handle_serial_control(msg, copter.gps);
         break;
diff --git a/ArduCopter/Log.cpp b/ArduCopter/Log.cpp
index 327600d2ab..12c5fd0713 100644
--- a/ArduCopter/Log.cpp
+++ b/ArduCopter/Log.cpp
@@ -922,7 +922,7 @@ void Copter::start_logging()
     if (g.log_bitmask == 0) {
         return;
     }
-    if (in_log_download) {
+    if (DataFlash.in_log_download()) {
         return;
     }
 
diff --git a/ArduCopter/system.cpp b/ArduCopter/system.cpp
index ad75453b51..e2bf6ec2f3 100644
--- a/ArduCopter/system.cpp
+++ b/ArduCopter/system.cpp
@@ -497,9 +497,6 @@ bool Copter::should_log(uint32_t mask)
     if (!DataFlash.should_log()) {
         return false;
     }
-    if (in_log_download) {
-        return false;
-    }
     start_logging();
     return true;
 #else