From 8697faa44fe5ceb45fca6f560dffb86550f6f0f6 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Tue, 27 Jun 2017 15:24:14 +1000
Subject: [PATCH] Rover: move should_log check of log bitmask into DataFlash

---
 APMrover2/Rover.cpp  | 2 +-
 APMrover2/system.cpp | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/APMrover2/Rover.cpp b/APMrover2/Rover.cpp
index f30864cdf4..0151abf53f 100644
--- a/APMrover2/Rover.cpp
+++ b/APMrover2/Rover.cpp
@@ -24,7 +24,7 @@ Rover::Rover(void) :
     channel_steer(nullptr),
     channel_throttle(nullptr),
     channel_learn(nullptr),
-    DataFlash{FIRMWARE_STRING},
+    DataFlash{FIRMWARE_STRING, g.log_bitmask},
     modes(&g.mode1),
     L1_controller(ahrs, nullptr),
     nav_controller(&L1_controller),
diff --git a/APMrover2/system.cpp b/APMrover2/system.cpp
index a1f13b8cb3..3e5082dea1 100644
--- a/APMrover2/system.cpp
+++ b/APMrover2/system.cpp
@@ -502,10 +502,7 @@ uint8_t Rover::check_digital_pin(uint8_t pin)
  */
 bool Rover::should_log(uint32_t mask)
 {
-    if (!(mask & g.log_bitmask)) {
-        return false;
-    }
-    if (!DataFlash.should_log()) {
+    if (!DataFlash.should_log(mask)) {
         return false;
     }
     start_logging();