Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-09 09:28:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Plane: simplify should_log (NFC)

Browse Source
This commit is contained in:
Peter Barker 2017-06-09 13:38:54 +10:00 committed by Francisco Ferreira
parent 332e5059e2
commit 927cc75843
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ArduPlane/system.cpp
View File

@ -835,14 +835,22 @@ void Plane::print_comma(void)
bool Plane::should_log(uint32_t mask) bool Plane::should_log(uint32_t mask)
{ {
#if LOGGING_ENABLED == ENABLED #if LOGGING_ENABLED == ENABLED
if (!(mask & g.log_bitmask) || in_mavlink_delay) { if (in_mavlink_delay) {
return false; return false;
} }
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;
#else #else
return false; return false;
#endif #endif