diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-03 13:37:42 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-03 13:37:42 +0200 |
| commit | da5b60adab798710f8f61940edfee73a1c46542a (patch) | |
| tree | 9d1434f072c49323fc9e8aa7106f585a88f85dfd /src/drivers/lsm303d/lsm303d.cpp | |
| parent | 325d5026bb6d36ab3557ab999f8db772f77ac7a1 (diff) | |
| parent | a3c238579d8b3325a924f01c7ae77ff494ac73f6 (diff) | |
| download | px4-firmware-da5b60adab798710f8f61940edfee73a1c46542a.tar.gz px4-firmware-da5b60adab798710f8f61940edfee73a1c46542a.tar.bz2 px4-firmware-da5b60adab798710f8f61940edfee73a1c46542a.zip | |
Merge branch 'master' of github.com:PX4/Firmware
Diffstat (limited to 'src/drivers/lsm303d/lsm303d.cpp')
| -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)) |