Merged master into cmake-2

This commit is contained in:
Lorenz Meier
2015-09-20 10:33:39 +02:00
45 changed files with 1858 additions and 985 deletions
+1 -1
View File
@@ -1436,7 +1436,7 @@ int commander_thread_main(int argc, char *argv[])
* vertical separation from other airtraffic the operator has to know when the
* barometer is inoperational.
* */
if (hrt_elapsed_time(&sensors.baro_timestamp) < FAILSAFE_DEFAULT_TIMEOUT) {
if (hrt_elapsed_time(&sensors.baro_timestamp[0]) < FAILSAFE_DEFAULT_TIMEOUT) {
/* handle the case where baro was regained */
if (status.barometer_failure) {
status.barometer_failure = false;