diff options
| author | Kynos <mail01@delago.net> | 2014-06-15 12:30:06 +0200 |
|---|---|---|
| committer | Kynos <mail01@delago.net> | 2014-06-15 12:30:06 +0200 |
| commit | 137564b4a6b78c82a4c38ebd02782c531f259c19 (patch) | |
| tree | d83e97fca1c3a8e052cf957e6a12b44dc1d8dafa /src/drivers | |
| parent | 7724e3d889eecd6733c6e85341a9f0b97faa37cf (diff) | |
| parent | 251760679a4bed86fdb10746062fde2cc23e460f (diff) | |
| download | px4-firmware-137564b4a6b78c82a4c38ebd02782c531f259c19.tar.gz px4-firmware-137564b4a6b78c82a4c38ebd02782c531f259c19.tar.bz2 px4-firmware-137564b4a6b78c82a4c38ebd02782c531f259c19.zip | |
Merge master with the exception of ubx.cpp and ubx.h
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/lsm303d/lsm303d.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/drivers/lsm303d/lsm303d.cpp b/src/drivers/lsm303d/lsm303d.cpp index 4ca8b5e42..8bf76dcc3 100644 --- a/src/drivers/lsm303d/lsm303d.cpp +++ b/src/drivers/lsm303d/lsm303d.cpp @@ -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)) |