mirror of https://github.com/ArduPilot/ardupilot
Sub: simplify start_logging
This commit is contained in:
parent
df0e9029b0
commit
67a5c1dfc0
|
@ -466,22 +466,25 @@ void Sub::Log_Write_Vehicle_Startup_Messages()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// start a new log
|
|
||||||
void Sub::start_logging()
|
void Sub::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()) {
|
|
||||||
hal.console->println("Starting new log");
|
|
||||||
// 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 Sub::log_init(void)
|
void Sub::log_init(void)
|
||||||
|
|
Loading…
Reference in New Issue