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

Copter: remove extra in_mavlink_delay from should_log function 

Also return false when logging disabled
This commit is contained in:
Randy Mackay 2014-10-17 16:07:47 +09:00
parent c3d839456b
commit dcf72e9b78
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ArduCopter/system.pde
View File

@ -409,6 +409,7 @@ static void telemetry_send(void)
*/
static bool should_log(uint32_t mask)
{
#if LOGGING_ENABLED == ENABLED
if (!(mask & g.log_bitmask) || in_mavlink_delay) {
return false;
}
@ -416,9 +417,10 @@ static bool should_log(uint32_t mask)
if (ret && !DataFlash.logging_started() && !in_log_download) {
// we have to set in_mavlink_delay to prevent logging while
// writing headers
in_mavlink_delay = true;
start_logging();
in_mavlink_delay = false;
}
return ret;
#else
return false;
#endif
}