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

Sub: stop using in_mavlink_delay as a proxy for disabling logging

Browse Source
This commit is contained in:
Peter Barker 2017-06-15 12:09:08 +10:00 committed by Francisco Ferreira
parent 31ac03368d
commit 75a89dbfeb
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduSub/GCS_Mavlink.cpp
View File

@ -1828,6 +1828,7 @@ void Sub::mavlink_delay_cb()
} }
in_mavlink_delay = true; in_mavlink_delay = true;
DataFlash.EnableWrites(false);
uint32_t tnow = millis(); uint32_t tnow = millis();
if (tnow - last_1hz > 1000) { if (tnow - last_1hz > 1000) {
@ -1847,6 +1848,7 @@ void Sub::mavlink_delay_cb()
gcs_send_text(MAV_SEVERITY_INFO, "Initialising APM"); gcs_send_text(MAV_SEVERITY_INFO, "Initialising APM");
} }
DataFlash.EnableWrites(true);
in_mavlink_delay = false; in_mavlink_delay = false;
} }

3
ArduSub/system.cpp
View File

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