From 954eda990af8e19f9a798515f6deabc65bf28020 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Fri, 30 Jun 2017 22:31:08 +1000 Subject: [PATCH] AP_Arming: prepare log for arming and check it is ready Also add comment that this should be the last check to be made --- libraries/AP_Arming/AP_Arming.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libraries/AP_Arming/AP_Arming.cpp b/libraries/AP_Arming/AP_Arming.cpp index e3272d8fd0..dc54af1c56 100644 --- a/libraries/AP_Arming/AP_Arming.cpp +++ b/libraries/AP_Arming/AP_Arming.cpp @@ -491,9 +491,13 @@ bool AP_Arming::pre_arm_checks(bool report) bool AP_Arming::arm_checks(uint8_t method) { + // note that this will prepare DataFlash to start logging + // so should be the last check to be done before arming if ((checks_to_perform & ARMING_CHECK_ALL) || (checks_to_perform & ARMING_CHECK_LOGGING)) { - if (!DataFlash_Class::instance()->logging_started()) { + DataFlash_Class *df = DataFlash_Class::instance(); + df->PrepForArming(); + if (!df->logging_started()) { gcs().send_text(MAV_SEVERITY_CRITICAL, "Arm: Logging not started"); return false; }