fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-14 21:03:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge upstream and resolve merge conflicts.

Browse Source
This commit is contained in:
mcsauder
2016-02-23 19:29:30 -07:00
parent 4ce4724105 237ecfef1a
commit fad1c87631
26 changed files with 1867 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EKF/estimator_interface.cpp
+2 -2
View File
@@ -44,7 +44,7 @@
#include <inttypes.h>
#include <math.h>
#include "estimator_interface.h"
#include <mathlib/mathlib.h>
#include "mathlib.h"
EstimatorInterface::EstimatorInterface():
@@ -237,7 +237,7 @@ bool EstimatorInterface::initialise_interface(uint64_t timestamp)
_airspeed_buffer.allocate(OBS_BUFFER_LENGTH) &&
_flow_buffer.allocate(OBS_BUFFER_LENGTH) &&
_output_buffer.allocate(IMU_BUFFER_LENGTH))) {
// PX4_WARN("Estimator Buffer Allocation failed!");
printf("Estimator Buffer Allocation failed!");
unallocate_buffers();
return false;
}