Browse Source

Copter: move should_log check of log bitmask into DataFlash

mission-4.1.18
Peter Barker 8 years ago committed by Francisco Ferreira
parent
commit
cfbde937c6
  1. 2
      ArduCopter/Copter.cpp
  2. 5
      ArduCopter/system.cpp

2
ArduCopter/Copter.cpp

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

5
ArduCopter/system.cpp

@ -491,10 +491,7 @@ void Copter::check_usb_mux(void) @@ -491,10 +491,7 @@ void Copter::check_usb_mux(void)
bool Copter::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();

Loading…
Cancel
Save