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
@@ -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");