From e45efeb8298c46b9e6b6e73d5c02579a193db967 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Fri, 30 Jun 2017 21:10:00 +1000
Subject: [PATCH] Copter: move starting of new logs into DataFlash

---
 ArduCopter/AP_Arming.cpp |  5 -----
 ArduCopter/Copter.h      |  1 -
 ArduCopter/Log.cpp       | 17 -----------------
 ArduCopter/system.cpp    |  7 ++-----
 4 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/ArduCopter/AP_Arming.cpp b/ArduCopter/AP_Arming.cpp
index fcd5df2d67..82b08455ee 100644
--- a/ArduCopter/AP_Arming.cpp
+++ b/ArduCopter/AP_Arming.cpp
@@ -544,11 +544,6 @@ bool AP_Arming_Copter::pre_arm_proximity_check(bool display_failure)
 //  has side-effect that logging is started
 bool AP_Arming_Copter::arm_checks(bool display_failure, bool arming_from_gcs)
 {
-    #if LOGGING_ENABLED == ENABLED
-    // start dataflash
-    copter.start_logging();
-    #endif
-
     // check accels and gyro are healthy
     if ((checks_to_perform == ARMING_CHECK_ALL) || (checks_to_perform & ARMING_CHECK_INS)) {
         //check if accelerometers have calibrated and require reboot
diff --git a/ArduCopter/Copter.h b/ArduCopter/Copter.h
index 1626789ace..f87f120ade 100644
--- a/ArduCopter/Copter.h
+++ b/ArduCopter/Copter.h
@@ -755,7 +755,6 @@ private:
     void Log_Write_Beacon();
     void Log_Write_Vehicle_Startup_Messages();
     void Log_Read(uint16_t log_num, uint16_t start_page, uint16_t end_page);
-    void start_logging() ;
     void load_parameters(void);
     void convert_pid_parameters(void);
     void userhook_init();
diff --git a/ArduCopter/Log.cpp b/ArduCopter/Log.cpp
index 0843b8792e..5ce2a34c9f 100644
--- a/ArduCopter/Log.cpp
+++ b/ArduCopter/Log.cpp
@@ -917,22 +917,6 @@ void Copter::Log_Write_Vehicle_Startup_Messages()
 }
 
 
-void Copter::start_logging()
-{
-    if (g.log_bitmask == 0) {
-        return;
-    }
-    if (DataFlash.in_log_download()) {
-        return;
-    }
-
-    ap.logging_started = true;
-
-    // dataflash may have stopped logging - when we get_log_data,
-    // for example.  Always try to restart:
-    DataFlash.StartUnstartedLogging();
-}
-
 void Copter::log_init(void)
 {
     DataFlash.Init(log_structure, ARRAY_SIZE(log_structure));
@@ -989,7 +973,6 @@ void Copter::Log_Write_Heli() {}
 void Copter::Log_Write_Optflow() {}
 #endif
 
-void Copter::start_logging() {}
 void Copter::log_init(void) {}
 
 #endif // LOGGING_ENABLED
diff --git a/ArduCopter/system.cpp b/ArduCopter/system.cpp
index 812c274f07..c034a5c78e 100644
--- a/ArduCopter/system.cpp
+++ b/ArduCopter/system.cpp
@@ -491,11 +491,8 @@ void Copter::check_usb_mux(void)
 bool Copter::should_log(uint32_t mask)
 {
 #if LOGGING_ENABLED == ENABLED
-    if (!DataFlash.should_log(mask)) {
-        return false;
-    }
-    start_logging();
-    return true;
+    ap.logging_started = DataFlash.logging_started();
+    return DataFlash.should_log(mask);
 #else
     return false;
 #endif