Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Trent Lukaczyk
2015-02-05 20:19:04 -08:00
215 changed files with 10958 additions and 2458 deletions
+1 -1
View File
@@ -1431,7 +1431,7 @@ Mavlink::task_main(int argc, char *argv[])
if (status_sub->update(&status_time, &status)) {
/* switch HIL mode if required */
set_hil_enabled(status.hil_state == HIL_STATE_ON);
set_hil_enabled(status.hil_state == vehicle_status_s::HIL_STATE_ON);
}
/* check for requested subscriptions */