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

Copter: move should_log check of log bitmask into DataFlash

Browse Source
This commit is contained in:
Peter Barker 2017-06-27 14:14:08 +10:00 committed by Francisco Ferreira
parent 4dfdffde43
commit cfbde937c6
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduCopter/Copter.cpp
View File

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

5
ArduCopter/system.cpp
View File

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