Browse Source

Tracker: stop using in_mavlink_delay as a proxy for disabling logging

master
Peter Barker 8 years ago committed by Francisco Ferreira
parent
commit
31ac03368d
  1. 2
      AntennaTracker/GCS_Mavlink.cpp
  2. 3
      AntennaTracker/system.cpp

2
AntennaTracker/GCS_Mavlink.cpp

@ -889,6 +889,7 @@ void Tracker::mavlink_delay_cb() @@ -889,6 +889,7 @@ void Tracker::mavlink_delay_cb()
if (!gcs_chan[0].initialised) return;
tracker.in_mavlink_delay = true;
DataFlash.EnableWrites(false);
uint32_t tnow = AP_HAL::millis();
if (tnow - last_1hz > 1000) {
@ -906,6 +907,7 @@ void Tracker::mavlink_delay_cb() @@ -906,6 +907,7 @@ void Tracker::mavlink_delay_cb()
last_5s = tnow;
gcs_send_text(MAV_SEVERITY_INFO, "Initialising APM");
}
DataFlash.EnableWrites(true);
tracker.in_mavlink_delay = false;
}

3
AntennaTracker/system.cpp

@ -253,9 +253,6 @@ void Tracker::check_usb_mux(void) @@ -253,9 +253,6 @@ void Tracker::check_usb_mux(void)
*/
bool Tracker::should_log(uint32_t mask)
{
if (in_mavlink_delay) {
return false;
}
if (!(mask & g.log_bitmask)) {
return false;
}

Loading…
Cancel
Save