Merge master with the exception of ubx.cpp and ubx.h

This commit is contained in:
Kynos
2014-06-15 12:30:06 +02:00
19 changed files with 520 additions and 279 deletions
+1 -1
View File
@@ -880,7 +880,7 @@ LSM303D::mag_read(struct file *filp, char *buffer, size_t buflen)
/* manual measurement */
_mag_reports->flush();
measure();
_mag->measure();
/* measurement will have generated a report, copy it out */
if (_mag_reports->get(mrb))