Merge branch 'ekf_voting_priority'

This commit is contained in:
Lorenz Meier
2015-09-19 10:51:01 +02:00
36 changed files with 1723 additions and 950 deletions
+1 -1
View File
@@ -274,7 +274,7 @@ MS5611::init()
}
/* allocate basic report buffers */
_reports = new ringbuffer::RingBuffer(2, sizeof(baro_report));
_reports = new ringbuffer::RingBuffer(2, sizeof(sensor_baro_s));
if (_reports == nullptr) {
DEVICE_DEBUG("can't get memory for reports");