Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-08 17:03:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Copter: simplify start_logging

Browse Source
This commit is contained in:
Peter Barker 2017-06-09 11:52:23 +10:00 committed by Francisco Ferreira
parent 0be2e7962f
commit 2bb22da599
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ArduCopter/Log.cpp
View File

@ -906,21 +906,25 @@ void Copter::Log_Write_Vehicle_Startup_Messages()
} }
// start a new log void Copter::start_logging()
void Copter::start_logging()
{ {
if (g.log_bitmask != 0 && !in_log_download) { if (g.log_bitmask == 0) {
if (!ap.logging_started) { return;
ap.logging_started = true;
DataFlash.StartNewLog();
} else if (!DataFlash.logging_started()) {
// dataflash may have stopped logging - when we get_log_data,
// for example. Try to restart:
DataFlash.StartNewLog();
}
// enable writes
DataFlash.EnableWrites(true);
} }
if (in_log_download) {
return;
}
ap.logging_started = true;
// dataflash may have stopped logging - when we get_log_data,
// for example. Always try to restart:
if (!DataFlash.logging_started()) {
DataFlash.StartNewLog();
}
// enable writes
DataFlash.EnableWrites(true);
} }
void Copter::log_init(void) void Copter::log_init(void)