From 31ac03368dae4c850f5407a46522d9ebc2184f3b Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Thu, 15 Jun 2017 12:08:27 +1000 Subject: [PATCH] Tracker: stop using in_mavlink_delay as a proxy for disabling logging --- AntennaTracker/GCS_Mavlink.cpp | 2 ++ AntennaTracker/system.cpp | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/AntennaTracker/GCS_Mavlink.cpp b/AntennaTracker/GCS_Mavlink.cpp index 1a3a8a1c3c..51922abae2 100644 --- a/AntennaTracker/GCS_Mavlink.cpp +++ b/AntennaTracker/GCS_Mavlink.cpp @@ -889,6 +889,7 @@ void Tracker::mavlink_delay_cb() if (!gcs_chan[0].initialised) return; tracker.in_mavlink_delay = true; + DataFlash.EnableWrites(false); uint32_t tnow = AP_HAL::millis(); if (tnow - last_1hz > 1000) { @@ -906,6 +907,7 @@ void Tracker::mavlink_delay_cb() last_5s = tnow; gcs_send_text(MAV_SEVERITY_INFO, "Initialising APM"); } + DataFlash.EnableWrites(true); tracker.in_mavlink_delay = false; } diff --git a/AntennaTracker/system.cpp b/AntennaTracker/system.cpp index 20d94a7d8c..a39f1bdb33 100644 --- a/AntennaTracker/system.cpp +++ b/AntennaTracker/system.cpp @@ -253,9 +253,6 @@ void Tracker::check_usb_mux(void) */ bool Tracker::should_log(uint32_t mask) { - if (in_mavlink_delay) { - return false; - } if (!(mask & g.log_bitmask)) { return false; }