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

HAL_SITL: don't sync clocks during system initialisation

Browse Source
This commit is contained in:
Andrew Tridgell 2015-03-24 08:02:47 -07:00
parent 127791127c
commit 0c2232a4be
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libraries/AP_HAL_AVR_SITL/Scheduler.cpp
View File

@ -282,7 +282,7 @@ void SITLScheduler::_run_timer_procs(bool called_from_isr)
// and the failsafe, if one is setup // and the failsafe, if one is setup
if (_failsafe != NULL) { if (_failsafe != NULL) {
//_failsafe(NULL); _failsafe();
} }
_in_timer_proc = false; _in_timer_proc = false;
@ -320,16 +320,19 @@ void SITLScheduler::panic(const prog_char_t *errormsg) {
void SITLScheduler::stop_clock(uint64_t time_usec) void SITLScheduler::stop_clock(uint64_t time_usec)
{ {
stopped_clock_usec = time_usec; stopped_clock_usec = time_usec;
/* if (!system_initializing()) {
we want to ensure the main thread /*
*/ we want to ensure the main thread gets a chance to run on
while (wait_time_usec == 0) { each tick from the FDM
pthread_yield(); */
} while (wait_time_usec == 0) {
kill(0, SIGCONT); pthread_yield();
while (wait_time_usec != 0 && wait_time_usec <= time_usec) { }
kill(0, SIGCONT); kill(0, SIGCONT);
pthread_yield(); while (wait_time_usec != 0 && wait_time_usec <= time_usec) {
kill(0, SIGCONT);
pthread_yield();
}
} }
_run_io_procs(false); _run_io_procs(false);
} }