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

Tracker: make scheduler track whether it has called the delay callback

Browse Source
This commit is contained in:
Peter Barker 2018-05-08 16:33:29 +10:00 committed by Andrew Tridgell
parent dee40f3fe5
commit a386c6100c
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AntennaTracker/GCS_Mavlink.cpp
View File

@ -320,7 +320,7 @@ GCS_MAVLINK_Tracker::data_stream_send(void)
{ {
send_queued_parameters(); send_queued_parameters();
if (tracker.in_mavlink_delay) { if (hal.scheduler->in_delay_callback()) {
// don't send any other stream types while in the delay callback // don't send any other stream types while in the delay callback
return; return;
} }
@ -703,7 +703,6 @@ void Tracker::mavlink_delay_cb()
return; return;
} }
tracker.in_mavlink_delay = true;
DataFlash.EnableWrites(false); DataFlash.EnableWrites(false);
uint32_t tnow = AP_HAL::millis(); uint32_t tnow = AP_HAL::millis();
@ -723,7 +722,6 @@ void Tracker::mavlink_delay_cb()
gcs().send_text(MAV_SEVERITY_INFO, "Initialising APM"); gcs().send_text(MAV_SEVERITY_INFO, "Initialising APM");
} }
DataFlash.EnableWrites(true); DataFlash.EnableWrites(true);
tracker.in_mavlink_delay = false;
} }
/* /*

3
AntennaTracker/Tracker.h
View File

@ -193,9 +193,6 @@ private:
uint8_t one_second_counter = 0; uint8_t one_second_counter = 0;
bool target_set = false; bool target_set = false;
// use this to prevent recursion during sensor init
bool in_mavlink_delay = false;
static const AP_Scheduler::Task scheduler_tasks[]; static const AP_Scheduler::Task scheduler_tasks[];
static const AP_Param::Info var_info[]; static const AP_Param::Info var_info[];
static const struct LogStructure log_structure[]; static const struct LogStructure log_structure[];