fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-17 22:00:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merged master into linux

Browse Source
This commit is contained in:
Lorenz Meier
2015-05-19 21:00:02 +02:00
parent eaef0db7d6 11564a0f14
commit d906fb8f31
16 changed files with 218 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/state_machine_helper.cpp
+1 -1
View File
@@ -739,5 +739,5 @@ int prearm_check(const struct vehicle_status_s *status, const int mavlink_fd)
checkAirspeed = true;
}
return !Commander::preflightCheck(mavlink_fd, true, true, true, true, checkAirspeed, true, true);
return !Commander::preflightCheck(mavlink_fd, true, true, true, true, checkAirspeed, true, !status->circuit_breaker_engaged_gpsfailure_check, true);
}