Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rover: simplify should_log (NFC)

This commit is contained in:
Peter Barker 2017-06-09 13:38:28 +10:00 committed by Randy Mackay
parent cfd6d95927
commit 7ceafcb469
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
APMrover2/system.cpp
View File

@ -546,14 +546,22 @@ uint8_t Rover::check_digital_pin(uint8_t pin)
*/ */
bool Rover::should_log(uint32_t mask) bool Rover::should_log(uint32_t mask)
{ {
if (!(mask & g.log_bitmask) || in_mavlink_delay) { if (in_mavlink_delay) {
return false; return false;
} }
const bool ret = hal.util->get_soft_armed() || DataFlash.log_while_disarmed(); if (!(mask & g.log_bitmask)) {
if (ret && !DataFlash.logging_started() && !in_log_download) { return false;
}
if (!hal.util->get_soft_armed() && !DataFlash.log_while_disarmed()) {
return false;
}
if (in_log_download) {
return false;
}
if (!DataFlash.logging_started()) {
start_logging(); start_logging();
} }
return ret; return true;
} }
/* /*