Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-20 15:48:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Sub: move init of DataFlash references into vehicle init

Browse Source 
It is possible to start a log before the existing codepath is crossed.
This commit is contained in:
Peter Barker 2017-05-01 16:14:32 +10:00 committed by Francisco Ferreira
parent 74e0d6c60a
commit 652292e5c0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduSub/Log.cpp
View File

@ -472,8 +472,6 @@ void Sub::start_logging()
if (g.log_bitmask != 0 && !in_log_download) { if (g.log_bitmask != 0 && !in_log_download) {
if (!ap.logging_started) { if (!ap.logging_started) {
ap.logging_started = true; ap.logging_started = true;
DataFlash.set_mission(&mission);
DataFlash.setVehicle_Startup_Log_Writer(FUNCTOR_BIND(&sub, &Sub::Log_Write_Vehicle_Startup_Messages, void));
DataFlash.StartNewLog(); DataFlash.StartNewLog();
} else if (!DataFlash.logging_started()) { } else if (!DataFlash.logging_started()) {
hal.console->println("Starting new log"); hal.console->println("Starting new log");

4
ArduSub/system.cpp
View File

@ -165,6 +165,10 @@ void Sub::init_ardupilot()
// initialise mission library // initialise mission library
mission.init(); mission.init();
// initialise DataFlash library
DataFlash.set_mission(&mission);
DataFlash.setVehicle_Startup_Log_Writer(FUNCTOR_BIND(&sub, &Sub::Log_Write_Vehicle_Startup_Messages, void));
startup_INS_ground(); startup_INS_ground();
// we don't want writes to the serial port to cause us to pause // we don't want writes to the serial port to cause us to pause