Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-22 08:38:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Sub: move should_log check of log bitmask into DataFlash

Browse Source
This commit is contained in:
Peter Barker 2017-06-27 16:32:25 +10:00 committed by Francisco Ferreira
parent 8697faa44f
commit 4913fc2f2a
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduSub/Sub.cpp
View File

@ -21,7 +21,7 @@ const AP_HAL::HAL& hal = AP_HAL::get_HAL();
constructor for main Sub class
*/
Sub::Sub(void) :
DataFlash {FIRMWARE_STRING},
DataFlash {FIRMWARE_STRING, g.log_bitmask},
mission(ahrs,
FUNCTOR_BIND_MEMBER(&Sub::start_command, bool, const AP_Mission::Mission_Command &),
FUNCTOR_BIND_MEMBER(&Sub::verify_command_callback, bool, const AP_Mission::Mission_Command &),

5
ArduSub/system.cpp
View File

@ -291,10 +291,7 @@ bool Sub::optflow_position_ok()
bool Sub::should_log(uint32_t mask)
{
#if LOGGING_ENABLED == ENABLED
if (!(mask & g.log_bitmask)) {
return false;
}
if (!DataFlash.should_log()) {
if (!DataFlash.should_log(mask)) {
return false;
}
start_logging();