From 5b70b688cbe163acbda06d9e9604646fa9ba93cc Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Mon, 19 Jun 2017 10:22:43 +1000
Subject: [PATCH] Plane: handle knowledge of in_log_download in DataFlash

---
 ArduPlane/GCS_Mavlink.cpp | 17 -----------------
 ArduPlane/Plane.h         |  3 ---
 ArduPlane/system.cpp      |  3 ---
 3 files changed, 23 deletions(-)

diff --git a/ArduPlane/GCS_Mavlink.cpp b/ArduPlane/GCS_Mavlink.cpp
index e0e686698e..6d7f14e562 100644
--- a/ArduPlane/GCS_Mavlink.cpp
+++ b/ArduPlane/GCS_Mavlink.cpp
@@ -1903,23 +1903,6 @@ void GCS_MAVLINK_Plane::handleMessage(mavlink_message_t* msg)
         break;
     }
 
-    case MAVLINK_MSG_ID_LOG_REQUEST_DATA:
-        plane.in_log_download = true;
-        /* no break */
-    case MAVLINK_MSG_ID_LOG_ERASE:
-        /* no break */
-    case MAVLINK_MSG_ID_LOG_REQUEST_LIST:
-        if (!plane.in_mavlink_delay) {
-            plane.DataFlash.handle_mavlink_msg(*this, msg);
-        }
-        break;
-    case MAVLINK_MSG_ID_LOG_REQUEST_END:
-        plane.in_log_download = false;
-        if (!plane.in_mavlink_delay) {
-            plane.DataFlash.handle_mavlink_msg(*this, msg);
-        }
-        break;
-
     case MAVLINK_MSG_ID_SERIAL_CONTROL:
         handle_serial_control(msg, plane.gps);
         break;
diff --git a/ArduPlane/Plane.h b/ArduPlane/Plane.h
index 392a9f0bf0..1fc0f7a23c 100644
--- a/ArduPlane/Plane.h
+++ b/ArduPlane/Plane.h
@@ -183,9 +183,6 @@ private:
 
     DataFlash_Class DataFlash;
 
-    // has a log download started?
-    bool in_log_download;
-
     // scaled roll limit based on pitch
     int32_t roll_limit_cd;
     int32_t pitch_limit_min_cd;
diff --git a/ArduPlane/system.cpp b/ArduPlane/system.cpp
index 6b59c62f0b..3e506dc49c 100644
--- a/ArduPlane/system.cpp
+++ b/ArduPlane/system.cpp
@@ -841,9 +841,6 @@ bool Plane::should_log(uint32_t mask)
     if (!DataFlash.should_log()) {
         return false;
     }
-    if (in_log_download) {
-        return false;
-    }
     start_logging();
     return true;
 #else